Change session expiry to 28 days when "remember me" is set

[rails.git] / lib / potlatch2.rb

diff --git a/lib/potlatch2.rb b/lib/potlatch2.rb
index 89349c6c94ab7001ae5a23d46a4e825e89a15b95..0841eef7fd81d640ce6f8f61c1ae450ea4f772bd 100644 (file)
--- a/lib/potlatch2.rb
+++ b/lib/potlatch2.rb
@@ -1,16 +1,14 @@
 module Potlatch2
   LOCALES = {
     "de" => "de_DE",
-    "de-DE" => "de_DE",
-    "en" => "en_GB",
+    "en" => "en_US",
     "en-GB" => "en_GB",
     "fr" => "fr_FR",
-    "fr-FR" => "fr_FR",
     "ja" => "ja_JP",
-    "ja-JP" => "ja_JP",
+    "nb" => "nb_NO",
+    "nn" => "nn_NO",
+    "no" => "nb_NO",
     "pl" => "pl_PL",
-    "pl-PL" => "pl_PL",
-    "vi" => "vi_VN",
-    "vi-VN" => "vi_VN"
+    "vi" => "vi_VN"
   }
 end