code-dot-org · Hamms · Feb 23, 2017 · Feb 22, 2017 · Feb 22, 2017 · Feb 22, 2017
@@ -14,7 +14,6 @@ def push_out_translated_files
   rename_from_crowdin_name_to_locale
   run_bash_script "bin/i18n-codeorg/out.sh"
   copy_untranslated_apps
-  cleanup_chinese_and_portuguese_codes
   rebuild_blockly_js_files
   check_for_mismatching_links_or_images
   puts "updating TTS I18n (should usually take 2-3 minutes, may take up to 15 if there are a whole lot of translation updates)"
@@ -46,39 +45,6 @@ def copy_untranslated_apps
   end
 end
 
-# Dashboard currently has a bug; it uses 2 letter language codes instead of 4 letter locales.
-# When two languages share the same language code, Dashboard doesn't know which language
-# to use so we've overrided the user's selected language to always show Simplified Chinese
-# (zh-CN) even if they've selected Traditional Chinese (zh-TW). Likewise for Brazilian
-# Portuguese (pt-BR) and Portugal Portuguese (pt-PT).
-# TODO (Tanya): Fix Dashboard to use 4 letter locales instead of 2 letter language codes
-# and remove this hacky override.
-def cleanup_chinese_and_portuguese_codes
-  dashboard_categories = %w(authored_hints callouts data devise dsls failure_message_overrides instructions markdown_instructions scripts slides unplugged)
-
-  locales_with_same_language = {
-    'zh' => ['zh-CN', 'zh-TW'],
-    'pt' => ['pt-BR', 'pt-PT']
-  }
-
-  locales_with_same_language.each do |language, locales|
-    # Fix codes in base file
-    file = "dashboard/config/locales/#{locales[0]}.yml"
-    File.write(file, File.read(file).gsub(/"#{locales[0]}":/, "\"#{language}\":"))
-    file = "dashboard/config/locales/#{locales[1]}.yml"
-    File.write(file, File.read(file).gsub(/"#{language}":/, "\"#{locales[1]}\":"))
-
-    # Fix codes in each dashboard locale file
-    dashboard_categories.each do |dashboard|
-      file = "dashboard/config/locales/#{dashboard}.#{locales[0]}.yml"
-      File.write(file, File.read(file).gsub(/"#{locales[0]}":/, "\"#{language}\":"))
-
-      file = "dashboard/config/locales/#{dashboard}.#{locales[1]}.yml"
-      File.write(file, File.read(file).gsub(/"#{language}":/, "\"#{locales[1]}\":"))
-    end
-  end
-end
-
 def rebuild_blockly_js_files
   run_bash_script "apps/node_modules/@code-dot-org/blockly/i18n/codeorg-messages.sh"
   Dir.chdir('apps') do

diff --git a/dashboard/app/helpers/locale_helper.rb b/dashboard/app/helpers/locale_helper.rb
@@ -5,7 +5,7 @@ def locale
     # if(current_user && current_user.locale != current)
     #   TODO: Set language cookie and reload the page.
     # end
-    current.downcase.to_sym
+    current.to_sym
   end
 
   def locale_dir

diff --git a/dashboard/app/models/concerns/text_to_speech.rb b/dashboard/app/models/concerns/text_to_speech.rb
@@ -8,27 +8,27 @@
 TTS_BUCKET = 'cdo-tts'
 
 VOICES = {
-  'en-us': {
+  'en-US': {
     VOICE: 'sharon22k',
     SPEED: 180,
     SHAPE: 100
   },
-  'es-es': {
+  'es-ES': {
     VOICE: 'ines22k',
     SPEED: 180,
     SHAPE: 100,
   },
-  'es-mx': {
+  'es-MX': {
     VOICE: 'rosa22k',
     SPEED: 180,
     SHAPE: 100,
   },
-  'it-it': {
+  'it-IT': {
     VOICE: 'vittorio22k',
     SPEED: 180,
     SHAPE: 100,
   },
-  'pt-br': {
+  'pt-BR': {
     VOICE: 'marcia22k',
     SPEED: 180,
     SHAPE: 100,
@@ -81,7 +81,7 @@ def self.locale_supported?(locale)
   def self.localized_voice
     # Use localized voice if we have a setting for the current locale;
     # default to English otherwise.
-    loc = TextToSpeech.locale_supported?(I18n.locale) ? I18n.locale : :'en-us'
+    loc = TextToSpeech.locale_supported?(I18n.locale) ? I18n.locale : :'en-US'
     VOICES[loc]
   end
 

diff --git a/dashboard/config/application.rb b/dashboard/config/application.rb
@@ -85,11 +85,10 @@ class Application < Rails::Application
     # By default, config/locales/*.rb,yml are auto loaded.
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
     config.i18n.enforce_available_locales = false
-    config.i18n.available_locales = ['en']
+    config.i18n.available_locales = ['en-US']
     config.i18n.fallbacks = {}
-    config.i18n.default_locale = 'en-us'
-    locales = YAML.load_file("#{Rails.root}/config/locales.yml")
-    LOCALES = Hash[locales.map {|k, v| [k.downcase, v.class == String ? v.downcase : v]}]
+    config.i18n.default_locale = 'en-US'
+    LOCALES = YAML.load_file("#{Rails.root}/config/locales.yml")
     LOCALES.each do |locale, data|
       next unless data.is_a? Hash
       data.symbolize_keys!

@@ -1,4 +1,4 @@
-"pt":
+"pt-BR":
   data:
     authored_hints:
       2-3 Artist 1 new_authored_hint:

@@ -1,4 +1,4 @@
-"pt-PT":
+"pt":
   data:
     authored_hints:
       2-3 Artist 1 new_authored_hint:

@@ -1,4 +1,4 @@
-"zh":
+"zh-CN":
   data:
     authored_hints:
       2-3 Artist 1 new_authored_hint:

@@ -1,4 +1,4 @@
-"pt":
+"pt-BR":
   data:
     callouts:
       2-3 Artist 1 new_callout: []

@@ -1,4 +1,4 @@
-"pt-PT":
+"pt":
   data:
     callouts:
       2-3 Artist 1 new_callout: []

@@ -1,4 +1,4 @@
-"zh":
+"zh-CN":
   data:
     callouts:
       2-3 Artist 1 new_callout: []

@@ -1,4 +1,4 @@
-"pt":
+"pt-BR":
   data:
     game:
       name:

@@ -1,4 +1,4 @@
-"pt-PT":
+"pt":
   data:
     game:
       name:

@@ -1,4 +1,4 @@
-"zh":
+"zh-CN":
   data:
     game:
       name:

@@ -1,4 +1,4 @@
-"pt":
+"pt-BR":
   devise:
     confirmations:
       confirmed: Seu endereço de email foi confirmado com sucesso.

@@ -1,4 +1,4 @@
-"pt-PT":
+"pt":
   devise:
     confirmations:
       confirmed: O teu endereço de e-mail foi confirmado com sucesso.

@@ -1,4 +1,4 @@
-"zh":
+"zh-CN":
   devise:
     confirmations:
       confirmed: "你的电子邮件地址已验证成功。"

@@ -1,4 +1,4 @@
-"pt":
+"pt-BR":
   data:
     match:
       2-3 Big Event Match 1:

@@ -1,4 +1,4 @@
-"pt-PT":
+"pt":
   data:
     match:
       2-3 Big Event Match 1:

@@ -1,4 +1,4 @@
-"zh-TW":
+"zh":
   data:
     match:
       2-3 Big Event Match 1:

@@ -1,4 +1,4 @@
-"pt":
+"pt-BR":
   data:
     failure_message_overrides:
       Code Studio Puzzle Challenge 1 - Artist_instruction: |-

@@ -1,4 +1,4 @@
-"pt-PT":
+"pt":
   data:
     failure_message_overrides:
       Code Studio Puzzle Challenge 1 - Artist_instruction: |-

@@ -1,4 +1,4 @@
-"zh":
+"zh-CN":
   data:
     failure_message_overrides:
       Code Studio Puzzle Challenge 1 - Artist_instruction: |-

@@ -1,4 +1,4 @@
-"pt":
+"pt-BR":
   data:
     instructions:
       2-3 Artist 1 new_instruction: Oi, eu sou um artista. Você pode escrever códigos

@@ -1,4 +1,4 @@
-"pt-PT":
+"pt":
   data:
     instructions:
       2-3 Artist 1 new_instruction: Oi, eu sou um artista. Você pode escrever códigos

@@ -1,4 +1,4 @@
-"zh":
+"zh-CN":
   data:
     instructions:
       2-3 Artist 1 new_instruction: "您好，我是一个艺术家。你写的代码可以让我画任何的东西。 用几个程序模块来让我画一些灰色线条吧。

@@ -1,4 +1,4 @@
-"pt":
+"pt-BR":
   data:
     markdown_instructions:
       pre-assessment survey q25A'_markdown_instruction: |

@@ -1,4 +1,4 @@
-"pt-PT":
+"pt":
   data:
     markdown_instructions:
       pre-assessment survey q25A'_markdown_instruction: |

@@ -1,4 +1,4 @@
-"zh":
+"zh-CN":
   data:
     markdown_instructions:
       pre-assessment survey q25A'_markdown_instruction: |

@@ -1,4 +1,4 @@
-"pt":
+"pt-BR":
   errors:
     messages:
       not_saved: 'Corrija os seguintes erros:'

@@ -1,4 +1,4 @@
-"pt-PT":
+"pt":
   errors:
     messages:
       not_saved: 'Por favor, corrige os seguintes erros:'

@@ -1,4 +1,4 @@
-"pt":
+"pt-BR":
   data:
     script:
       name:

@@ -1,4 +1,4 @@
-"pt-PT":
+"pt":
   data:
     script:
       name:

@@ -1,4 +1,4 @@
-"zh":
+"zh-CN":
   data:
     script:
       name:

@@ -1,4 +1,4 @@
-"pt":
+"pt-BR":
   slides:
     maze_intro:
       1:

@@ -1,4 +1,4 @@
-"pt-PT":
+"pt":
   slides:
     maze_intro:
       1:

@@ -1,4 +1,4 @@
-"zh":
+"zh-CN":
   slides:
     maze_intro:
       1:

@@ -1,4 +1,4 @@
-"pt":
+"pt-BR":
   data:
     unplugged:
       Unplug1:

@@ -1,4 +1,4 @@
-"pt-PT":
+"pt":
   data:
     unplugged:
       Unplug1:

@@ -1,4 +1,4 @@
-"zh":
+"zh-CN":
   data:
     unplugged:
       Unplug1:

@@ -1,4 +1,4 @@
-"zh":
+"zh-CN":
   errors:
     messages:
       not_saved: "请更正以下错误:"

diff --git a/dashboard/scripts/update_tts_i18n.rb b/dashboard/scripts/update_tts_i18n.rb
@@ -2,7 +2,7 @@
 require_relative('../config/environment')
 require 'cdo/properties'
 
-ENABLED_LANGUAGES = [:'es-es', :'it-it', :'pt-br']
+ENABLED_LANGUAGES = [:'es-ES', :'it-IT', :'pt-BR']
 
 k1_script_names = [
   Script::COURSEA_DRAFT_NAME,

diff --git a/dashboard/test/controllers/activities_controller_test.rb b/dashboard/test/controllers/activities_controller_test.rb
@@ -157,7 +157,7 @@ def _test_logged_in_milestone(async_activity_writes:)
         script_level_id: @script_level.id,
         level_id: @script_level.level.id,
         user_agent: 'Rails Testing',
-        locale: :'en-us'
+        locale: :'en-US'
       }],
       slogger.records
     )

diff --git a/dashboard/test/controllers/api_controller_test.rb b/dashboard/test/controllers/api_controller_test.rb
@@ -224,7 +224,7 @@ def make_progress_in_section(script)
     expected_response = [
       {
         "student" => {"id" => @student_1.id, "name" => @student_1.name},
-        "stage" => "translation missing: en-us.data.script.name.#{script.name}.title",
+        "stage" => "translation missing: en-US.data.script.name.#{script.name}.title",
         "puzzle" => 1,
         "question" => "Long assessment 1",
         "url" => "http://test.host/s/#{script.name}/stage/1/puzzle/1?section_id=#{@section.id}&user_id=#{@student_1.id}",
@@ -322,7 +322,7 @@ def make_progress_in_section(script)
     # all these are translation missing because we don't actually generate i18n files in tests
     expected_response = [
       {
-        "stage" => "translation missing: en-us.data.script.name.#{script.name}.title",
+        "stage" => "translation missing: en-US.data.script.name.#{script.name}.title",
         "levelgroup_results" => [
           {
             "type" => "text_match",
@@ -449,7 +449,7 @@ def make_progress_in_section(script)
     # all these are translation missing because we don't actually generate i18n files in tests
     expected_response = [
       {
-        "stage" => "translation missing: en-us.data.script.name.#{script.name}.title",
+        "stage" => "translation missing: en-US.data.script.name.#{script.name}.title",
         "levelgroup_results" => [
           {
             "type" => "text_match",
@@ -1054,7 +1054,7 @@ def make_progress_in_section(script)
           script_level_id: script_level.id,
           level_id: level.id,
           user_agent: 'Rails Testing',
-          locale: :'en-us'
+          locale: :'en-US'
         }
       ],
       slogger.records
@@ -1087,7 +1087,7 @@ def make_progress_in_section(script)
           script_level_id: script_level.id,
           level_id: level.id,
           user_agent: 'Rails Testing',
-          locale: :'en-us'
+          locale: :'en-US'
         }
       ],
       slogger.records