Permalink
Browse files

correct japanese, chinese & portuguese locale codes

  • Loading branch information...
1 parent a7f7730 commit 63b39eb2c0c84bc30d1f1d208a299cabae849b2d Simon Tokumine committed with Jul 18, 2010
Showing with 8 additions and 3 deletions.
  1. +8 −3 app/models/tolk/locale.rb
View
@@ -25,7 +25,7 @@ class Locale < ActiveRecord::Base
'id' => 'Indonesian',
'is' => 'Icelandic',
'it' => 'Italian',
- 'jp' => 'Japanese',
+ 'ja' => 'Japanese',
'ko' => 'Korean',
'lo' => 'Lao',
'lt' => 'Lithuanian',
@@ -34,8 +34,8 @@ class Locale < ActiveRecord::Base
'nl' => 'Dutch',
'no' => 'Norwegian',
'pl' => 'Polish',
- 'pt-BR' => 'Portuguese (Brazilian)',
- 'pt-PT' => 'Portuguese (Portugal)',
+ 'pt-br' => 'Portuguese (Brazilian)',
+ 'pt-pt' => 'Portuguese (Portugal)',
'ro' => 'Romanian',
'ru' => 'Russian',
'se' => 'Swedish',
@@ -47,8 +47,13 @@ class Locale < ActiveRecord::Base
'tr' => 'Turkish',
'uk' => 'Ukrainian',
'vi' => 'Vietnamese',
+<<<<<<< HEAD
'zh-CN' => 'Chinese (Simplified)',
'zh-TW' => 'Chinese (Traditional)'
+=======
+ 'zh-cn' => 'Chinese (Simplified)',
+ 'zh-tw' => 'Chinese (Traditional)'
+>>>>>>> 4b90732... correct japanese, chinese & portuguese locale codes
}
has_many :phrases, :through => :translations, :class_name => 'Tolk::Phrase'

0 comments on commit 63b39eb

Please sign in to comment.