From 0e0c5a83e47206b5babb9570764142d08aab2808 Mon Sep 17 00:00:00 2001 From: Francisco Lopez Date: Wed, 18 Nov 2015 10:59:50 +0100 Subject: [PATCH 1/3] If you use to_rails_locale force you to use as default locale "en_US" which is an invalid locale code (and rails complains about it) With the funcion removed, you will compare "en-US" (locale code retrieved from OneSky) == "en-US" (Rails App) which is true --- lib/onesky/rails/client.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/onesky/rails/client.rb b/lib/onesky/rails/client.rb index 16cefdb..f1767e2 100644 --- a/lib/onesky/rails/client.rb +++ b/lib/onesky/rails/client.rb @@ -22,7 +22,7 @@ def initialize(config_hash) def verify_languages! languages = get_languages_from_onesky! languages.each do |language| - locale = language['custom_locale'] || to_rails_locale(language['code']) + locale = language['custom_locale'] || language['code'] if (language['is_base_language']) verify_base_locale!(locale) else From f4b39a733206bbf7cc1f25d0fb32886f74160aee Mon Sep 17 00:00:00 2001 From: Francisco Lopez Date: Wed, 18 Nov 2015 11:19:00 +0100 Subject: [PATCH 2/3] When the file is saved, it is necessary to make to conversion to rails locale format. Remember, the default_locale is en-US but we want to store the content in files with name like en_US.yml --- lib/onesky/rails/file_client.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/onesky/rails/file_client.rb b/lib/onesky/rails/file_client.rb index 1fb23e3..10fe7ef 100644 --- a/lib/onesky/rails/file_client.rb +++ b/lib/onesky/rails/file_client.rb @@ -59,7 +59,7 @@ def make_translation_dir(dir_path, locale) end def locale_file_name(file, to_locale) - file.sub(@base_locale.to_s, to_locale) + file.sub(to_rails_locale(@base_locale.to_s), to_locale) end def get_default_locale_files(string_path) From 30bb4e3bddb0386d115aba8f71c01347b531fbcc Mon Sep 17 00:00:00 2001 From: Francisco Lopez Date: Wed, 18 Nov 2015 13:36:48 +0100 Subject: [PATCH 3/3] Better to store files like en-US.yml than en_US.yml --- lib/onesky/rails/file_client.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/onesky/rails/file_client.rb b/lib/onesky/rails/file_client.rb index 10fe7ef..1fb23e3 100644 --- a/lib/onesky/rails/file_client.rb +++ b/lib/onesky/rails/file_client.rb @@ -59,7 +59,7 @@ def make_translation_dir(dir_path, locale) end def locale_file_name(file, to_locale) - file.sub(to_rails_locale(@base_locale.to_s), to_locale) + file.sub(@base_locale.to_s, to_locale) end def get_default_locale_files(string_path)