From 63b39eb2c0c84bc30d1f1d208a299cabae849b2d Mon Sep 17 00:00:00 2001
From: Simon Tokumine <simon@japancentre.com>
Date: Sun, 18 Jul 2010 11:56:06 +0100
Subject: [PATCH] correct japanese, chinese & portuguese locale codes

---
 app/models/tolk/locale.rb | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/models/tolk/locale.rb b/app/models/tolk/locale.rb
index 406ea56..6c5d184 100644
--- a/app/models/tolk/locale.rb
+++ b/app/models/tolk/locale.rb
@@ -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'