Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/diaspora/diaspora.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorJonne Haß <me@mrzyx.de>2013-09-19 00:14:26 +0400
committerJonne Haß <me@mrzyx.de>2013-09-19 00:14:47 +0400
commit5a821efa18e87d9f7e3bbc65467b901b1b5080c7 (patch)
tree76c7aa294554f70d2cb67be476cf1bc31d13e1b8 /config
parent5598cd803a626f0b2c67236d829a69ce6a9e15de (diff)
hardcode default(=fallback) language
Diffstat (limited to 'config')
-rw-r--r--config/initializers/locale.rb4
-rw-r--r--config/locale_settings.yml4
2 files changed, 2 insertions, 6 deletions
diff --git a/config/initializers/locale.rb b/config/initializers/locale.rb
index b233dd0cc..725de6f71 100644
--- a/config/initializers/locale.rb
+++ b/config/initializers/locale.rb
@@ -10,17 +10,17 @@ if settings_file.exist?
locale_settings = YAML.load_file(settings_file)
AVAILABLE_LANGUAGES = (locale_settings['available'].length > 0) ? locale_settings['available'] : { "en" => 'English' }
AVAILABLE_LANGUAGE_CODES = locale_settings['available'].keys
- DEFAULT_LANGUAGE = (AVAILABLE_LANGUAGE_CODES.include?(locale_settings['default'].to_s)) ? locale_settings['default'].to_s : "en"
LANGUAGE_CODES_MAP = locale_settings['fallbacks']
RTL_LANGUAGES = locale_settings['rtl']
else
AVAILABLE_LANGUAGES = { "en" => 'English' }
- DEFAULT_LANGUAGE = "en"
AVAILABLE_LANGUAGE_CODES = ["en"]
LANGUAGE_CODES_MAP = {}
RTL_LANGUAGES = []
end
+DEFAULT_LANGUAGE = "en"
+
# The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
# Use the railtie configuration option to ensure overiding devise.
diff --git a/config/locale_settings.yml b/config/locale_settings.yml
index 281b02306..a044a9e70 100644
--- a/config/locale_settings.yml
+++ b/config/locale_settings.yml
@@ -1,6 +1,3 @@
-default: "en"
-
-
available:
ar: "العربية"
art-nvi: "Na'vi"
@@ -116,7 +113,6 @@ fallbacks:
pt-PT:
- "pt"
-
rtl:
- "ar"
- "he"