Fix: lang consts

lib/models/user.js

@@ -11,11 +11,12 @@ module.exports = function(crowi) {
     , STATUS_SUSPENDED  = 3
     , STATUS_DELETED    = 4
     , STATUS_INVITED    = 5
-    , USER_PUBLIC_FIELDS = '_id image googleId name username email introduction status createdAt admin' // TODO: どこか別の場所へ...
+    , USER_PUBLIC_FIELDS = '_id image googleId name username email introduction status lang createdAt admin' // TODO: どこか別の場所へ...
 
+    , LANG_EN    = 'en'
     , LANG_EN_US = 'en-US'
     , LANG_EN_GB = 'en-GB'
-    , LANG_JA_JP = 'ja'
+    , LANG_JA    = 'ja'
 
     , PAGE_ITEMS        = 50
 
@@ -95,8 +96,10 @@ module.exports = function(crowi) {
 
   function getLanguageLabels() {
     var lang = {};
+    lang.LANG_EN    = LANG_EN;
     lang.LANG_EN_US = LANG_EN_US;
-    lang.LANG_JA_JP = LANG_JA_JP;
+    lang.LANG_EN_GB = LANG_EN_GB;
+    lang.LANG_JA    = LANG_JA;
 
     return lang;
   }
@@ -676,8 +679,10 @@ module.exports = function(crowi) {
   userSchema.statics.USER_PUBLIC_FIELDS = USER_PUBLIC_FIELDS;
   userSchema.statics.PAGE_ITEMS         = PAGE_ITEMS;
 
+  userSchema.statics.LANG_EN            = LANG_EN;
   userSchema.statics.LANG_EN_US         = LANG_EN_US;
-  userSchema.statics.LANG_JA_JP         = LANG_JA_JP;
+  userSchema.statics.LANG_EN_GB         = LANG_EN_US;
+  userSchema.statics.LANG_JA            = LANG_JA;
 
   return mongoose.model('User', userSchema);
 };

lib/views/me/index.html

@@ -83,10 +83,10 @@
           {% endif %}
         </div>
         <div class="form-group {% if not user.lang %}has-error{% endif %}">
-          <label for="userForm[lang]" class="col-sm-2 control-label">{{ t('lang') }}</label>
+          <label for="userForm[lang]" class="col-sm-2 control-label">{{ t('Language') }}</label>
           <div class="col-sm-4 radio">
             <label><input type="radio" name="userForm[lang]" value="{{ consts.language.LANG_EN_US }}" {% if user.lang == consts.language.LANG_EN_US %}checked="checked"{% endif %}>{{ t('English') }}</label>
-            <label><input type="radio" name="userForm[lang]" value="{{ consts.language.LANG_JA_JP }}" {% if user.lang == consts.language.LANG_JA_JP %}checked="checked"{% endif %}>{{ t('Japanese') }}</label>
+            <label><input type="radio" name="userForm[lang]" value="{{ consts.language.LANG_JA }}" {% if user.lang == consts.language.LANG_JA %}checked="checked"{% endif %}>{{ t('Japanese') }}</label>
           </div>
           <div class="col-sm-offset-2 col-sm-10">
           </div>