From 5a821efa18e87d9f7e3bbc65467b901b1b5080c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@mrzyx.de>
Date: Wed, 18 Sep 2013 22:14:26 +0200
Subject: [PATCH] hardcode default(=fallback) language
---
config/initializers/locale.rb | 4 ++--
config/locale_settings.yml | 4 ----
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/config/initializers/locale.rb b/config/initializers/locale.rb
index b233dd0ccd..725de6f710 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 281b02306f..a044a9e70d 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"
--
GitLab