Merge branch 'master' of https://github.com/johnsonpham/TechLooper

chrisshayan · Sep 24, 2015 · b2dc576 · b2dc576
2 parents ebae010 + 21432ea
commit b2dc576
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/main/webapp/assets/modules/translation/messages_en.json b/src/main/webapp/assets/modules/translation/messages_en.json
@@ -722,8 +722,8 @@
   "pageNotFound": "This page does not exist.",
   "disqualifyConfirmation": "Are you sure to disqualify this contestant?",
   "disqualifyingReason": "Disqualifying Reason",
-  "vietnamese": "Vietnamese",
-  "english": "English",
+  "vietnamese": "Tiếng Việt",
+  "english": "Tiếng Anh",
   "registrants": "Registrants",
   "fullNameField": "Full Name",
   "disqualify": "Disqualify",

diff --git a/src/main/webapp/assets/modules/translation/messages_vi.json b/src/main/webapp/assets/modules/translation/messages_vi.json
@@ -723,8 +723,8 @@
   "pageNotFound": "Trang này không tồn tại.",
   "disqualifyConfirmation": "Bạn có muốn loại bỏ thí sinh này?",
   "disqualifyingReason": "Lý Do Loại Bỏ",
-  "vietnamese": "Tiếng Việt",
-  "english": "Tiếng Anh",
+  "vietnamese": "Vietnamese",
+  "english": "English",
   "registrants": "Thí Sinh",
   "fullNameField": "Họ tên",
   "disqualify": "Loại Bỏ",