Merge branch 'master' into notes

[rails.git] / lib / potlatch2.rb

diff --git a/lib/potlatch2.rb b/lib/potlatch2.rb
index 8164a4f56c8bb6c5852de8a54593e1bfd6369e82..1c6c81cd44c12ae737fde8f160724099f7f0c764 100644 (file)
--- a/lib/potlatch2.rb
+++ b/lib/potlatch2.rb
@@ -2,13 +2,22 @@ module Potlatch2
   LOCALES = {
     "ar" => "ar",
     "ast" => "ast",
   LOCALES = {
     "ar" => "ar",
     "ast" => "ast",

+    "az" => "az",
+    "be" => "be",
+    "be-Tarask" => "be-tarask",

     "br" => "br",
     "br" => "br",

+    "bs" => "bs",

     "ca" => "ca",
     "cs" => "cs_CZ",
     "ca" => "ca",
     "cs" => "cs_CZ",

+    "da" => "da",

     "de" => "de_DE",
     "de" => "de_DE",

+    "diq" => "diq",
+    "dsb" => "dsb",

     "en" => "en_US",
     "en-GB" => "en_GB",
     "en" => "en_US",
     "en-GB" => "en_GB",

+    "el" => "el",

     "es" => "es_ES",
     "es" => "es_ES",

+    "et" => "et",

     "fa" => "fa",
     "fi" => "fi",
     "fr" => "fr_FR",
     "fa" => "fa",
     "fi" => "fi",
     "fr" => "fr_FR",


@@ -18,9 +27,13 @@ module Potlatch2
     "hsb" => "hsb",
     "hu" => "hu",
     "ia" => "ia",
     "hsb" => "hsb",
     "hu" => "hu",
     "ia" => "ia",

+    "it" => "it_IT",

     "ja" => "ja_JP",
     "ka" => "ka",
     "ja" => "ja_JP",
     "ka" => "ka",

+    "ko" => "ko",
+    "ky" => "ky",

     "lb" => "lb",
     "lb" => "lb",

+    "lt" => "lt",

     "lv" => "lv",
     "mk" => "mk",
     "ms" => "ms",
     "lv" => "lv",
     "mk" => "mk",
     "ms" => "ms",


@@ -30,13 +43,18 @@ module Potlatch2
     "no" => "nb_NO",
     "pl" => "pl_PL",
     "pt" => "pt_PT",
     "no" => "nb_NO",
     "pl" => "pl_PL",
     "pt" => "pt_PT",

+    "pt-BR" => "pt_BR",
+    "ro" => "ro",

     "ru" => "ru",
     "rue" => "rue",
     "sk" => "sk",
     "ru" => "ru",
     "rue" => "rue",
     "sk" => "sk",

+    "sl" => "sl",

     "sq" => "sq",
     "sq" => "sq",

-    "sr" => "sr-ec",
+    "sr-EC" => "sr-ec",
+    "sr-EL" => "sr-el",

     "sv" => "sv_SE",
     "ta" => "ta",
     "sv" => "sv_SE",
     "ta" => "ta",

+    "tl" => "tl",

     "tr" => "tr",
     "uk" => "uk",
     "vi" => "vi_VN",
     "tr" => "tr",
     "uk" => "uk",
     "vi" => "vi_VN",