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

@ -22,6 +22,29 @@
<div class="legend">
General
</div>
<div class="control-group">
<label class="control-label">
Language
</label>
<div class="controls">
<label class="flag-selector">
<span class="flag-wrapper">
<span data-bind="css: 'flag flag-' + mainLanguage()" style=""></span>
</span>
<span class="flag-name" data-bind="text: mainLanguageFullName, click: selectLanguage"></span>
<div data-bind="saveTrigger: languageTrigger"></div>
</label>
</div>
</div>
<div class="control-group">
<label class="control-label">
Theme
</label>
<div class="controls">
<select data-bind="options: themesOptions, value: mainTheme, optionsText: 'optText', optionsValue: 'optValue', saveTrigger: themeTrigger"></select>
<div data-bind="saveTrigger: themeTrigger"></div>
</div>
</div>
<div class="control-group">
<label class="control-label">
Title
@ -41,31 +64,11 @@
</div>
</div>
<div class="control-group">
<label class="control-label">
Language
</label>
<div class="controls">
<select data-bind="options: languagesOptions, value: mainLanguage, optionsText: 'optText', optionsValue: 'optValue', saveTrigger: languageTrigger"></select>
<div data-bind="saveTrigger: languageTrigger"></div>
<br />
<br />
<label data-bind="click: function () { allowLanguagesOnSettings(!allowLanguagesOnSettings()); }">
<i data-bind="css: allowLanguagesOnSettings() ? 'icon-checkbox-checked' : 'icon-checkbox-unchecked'"></i>
Allow language selection on settings screen
</label>
</div>
</div>
<div class="control-group">
<label class="control-label">
Theme
</label>
<div class="controls">
<select data-bind="options: themesOptions, value: mainTheme, optionsText: 'optText', optionsValue: 'optValue', saveTrigger: themeTrigger"></select>
<div data-bind="saveTrigger: themeTrigger"></div>
</div>
</div>
<div class="control-group">
<div class="controls">
<label data-bind="click: function () { allowThemes(!allowThemes()); }">
<i data-bind="css: allowThemes() ? 'icon-checkbox-checked' : 'icon-checkbox-unchecked'"></i>
Allow theme selection on settings screen