Add Simplified Chinese language.

Update language popup.

+ Merge conflict origin/master
This commit is contained in:
RainLoop Team 2013-11-19 21:41:21 +04:00
commit 101f956fa8
25 changed files with 1055 additions and 458 deletions

View file

@ -30,12 +30,21 @@ function AdminGeneral()
};
});
});
this.mainLanguageFullName = ko.computed(function () {
return Utils.convertLangName(this.mainLanguage());
}, this);
this.languagesOptions = ko.computed(function () {
return _.map(oData.languages(), function (sLanguage) {
var
sName = Utils.convertLangName(sLanguage),
sEn = Utils.convertLangName(sLanguage, true)
;
return {
'optValue': sLanguage,
'optText': Utils.convertLangName(sLanguage)
'optText': sName + (sEn !== sName ? ' (' + sEn + ')' : '')
};
});
});
@ -120,3 +129,8 @@ AdminGeneral.prototype.onBuild = function ()
}, 50);
};
AdminGeneral.prototype.selectLanguage = function ()
{
kn.showScreenPopup(PopupsLanguagesViewModel);
};