Skip to content

Commit cbefafc

Browse files
evoluteurevoluteur
committed
i18n - regrouped some strings.
1 parent 81ddc81 commit cbefafc

7 files changed

Lines changed: 160 additions & 155 deletions

File tree

‎js/dico/toolbar.js‎

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ Evol.viewClasses = {
3939
Evol.Toolbar = function() {
4040

4141
var eUI = Evol.UI,
42-
i18n = Evol.i18n;
42+
i18n = Evol.i18n,
43+
i18nTool = i18n.tools;
4344

4445
return Backbone.View.extend({
4546

@@ -72,36 +73,36 @@ return Backbone.View.extend({
7273
pageSize:20,
7374
buttons: {
7475
always:[
75-
{id: 'list', label: i18n.bList, icon:'th-list', n:'x'},
76-
{id: 'new', label: i18n.bNew, icon:'plus', n:'x', readonly:false}
76+
{id: 'list', label: i18nTool.bList, icon:'th-list', n:'x'},
77+
{id: 'new', label: i18nTool.bNew, icon:'plus', n:'x', readonly:false}
7778
],
7879
//linkOpt2h('selections','','star');
7980
actions:[
80-
//{id:'browse', label: i18n.bBrowse, icon:'eye', n:'1', readonly:false},
81-
{id:'edit', label: i18n.bEdit, icon:'edit', n:'1', readonly:false},
82-
{id:'save', label: i18n.bSave, icon:'floppy-disk', n:'1', readonly:false},
83-
{id:'del', label: i18n.bDelete, icon:'trash', n:'1', readonly:false},
84-
{id:'filter', label: i18n.bFilter, icon:'filter',n:'n'},
85-
//{id:'group',label: i18n.bGroup, icon:'resize-horizontal',n:'n'},
86-
{id:'export', label: i18n.bExport, icon:'cloud-download',n:'n'}
87-
//{id:'cog',label: i18n.bSettings, icon:'cog',n:'n'}
81+
//{id:'browse', label: i18nTool.bBrowse, icon:'eye', n:'1', readonly:false},
82+
{id:'edit', label: i18nTool.bEdit, icon:'edit', n:'1', readonly:false},
83+
{id:'save', label: i18nTool.bSave, icon:'floppy-disk', n:'1', readonly:false},
84+
{id:'del', label: i18nTool.bDelete, icon:'trash', n:'1', readonly:false},
85+
{id:'filter', label: i18nTool.bFilter, icon:'filter',n:'n'},
86+
//{id:'group',label: i18nTool.bGroup, icon:'resize-horizontal',n:'n'},
87+
{id:'export', label: i18nTool.bExport, icon:'cloud-download',n:'n'}
88+
//{id:'cog',label: i18nTool.bSettings, icon:'cog',n:'n'}
8889
],
8990
prevNext:[
9091
{id:'prev', label: '', icon:'chevron-left', n:'x'},
9192
{id:'next', label: '', icon:'chevron-right', n:'x'}
9293
],
9394
views: [
9495
// -- views ONE ---
95-
{id:'browse', label: i18n.bBrowse, icon:'eye-open',n:'1'},// // ReadOnly
96-
{id:'edit', label: i18n.bEdit, icon:'edit',n:'1', readonly:false},// // All Fields for editing
97-
{id:'mini', label: i18n.bMini, icon:'th-large',n:'1', readonly:false},// // Important Fields only
98-
//{id:'wiz',label: i18n.bWizard, icon:'arrow-right',n:'1'},
99-
{id:'json', label: i18n.bJSON, icon:'barcode',n:'1', readonly:false},
96+
{id:'browse', label: i18nTool.bBrowse, icon:'eye-open',n:'1'},// // ReadOnly
97+
{id:'edit', label: i18nTool.bEdit, icon:'edit',n:'1', readonly:false},// // All Fields for editing
98+
{id:'mini', label: i18nTool.bMini, icon:'th-large',n:'1', readonly:false},// // Important Fields only
99+
//{id:'wiz',label: i18nTool.bWizard, icon:'arrow-right',n:'1'},
100+
{id:'json', label: i18nTool.bJSON, icon:'barcode',n:'1', readonly:false},
100101
// -- views MANY ---
101-
{id:'list', label: i18n.bList, icon:'th-list',n:'n'},
102-
{id:'cards', label: i18n.bCards, icon:'th-large',n:'n'},
103-
{id:'bubbles', label: i18n.bBubbles, icon:'adjust',n:'n'},
104-
{id:'charts', label: i18n.bCharts, icon:'stats',n:'n'}
102+
{id:'list', label: i18nTool.bList, icon:'th-list',n:'n'},
103+
{id:'cards', label: i18nTool.bCards, icon:'th-large',n:'n'},
104+
{id:'bubbles', label: i18nTool.bBubbles, icon:'adjust',n:'n'},
105+
{id:'charts', label: i18nTool.bCharts, icon:'stats',n:'n'}
105106
],
106107
search: false
107108
}
@@ -386,9 +387,9 @@ return Backbone.View.extend({
386387
msg,
387388
cbs,
388389
[
389-
{id:'nosave', text:i18n.bNoSave, class:'btn-default'},
390-
{id:'cancel', text:i18n.bCancel, class:'btn-default'},
391-
{id:'ok', text:i18n.bSave, class:'btn-primary'}
390+
{id:'nosave', text:i18nTool.bNoSave, class:'btn-default'},
391+
{id:'cancel', text:i18nTool.bCancel, class:'btn-default'},
392+
{id:'ok', text:i18nTool.bSave, class:'btn-primary'}
392393
]
393394
);
394395
}else{
@@ -680,7 +681,7 @@ return Backbone.View.extend({
680681
}
681682
}
682683
return this.curView.setDefaults() //.clear()
683-
.setTitle(i18n.getLabel('NewEntity', this.uiModel.name, vw.getTitle()));
684+
.setTitle(i18n.getLabel('tools.NewEntity', this.uiModel.name, vw.getTitle()));
684685
},
685686

686687
deleteItem: function(){

‎js/dico/ui.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ Evol.UI = {
285285
alert: function(title, msg){
286286
var $m=$(this.HTMLModal('alert', title, msg, [{
287287
id:'ok',
288-
text: Evol.i18n.bOK,
288+
text: Evol.i18n.tools.bOK,
289289
class: 'btn-primary'
290290
}]))
291291
.on('click', 'button', function(evt){
@@ -320,8 +320,8 @@ Evol.UI = {
320320

321321
if(!buttons){
322322
buttons=[
323-
{id:'cancel', text:Evol.i18n.bCancel, class:'btn-default'},
324-
{id:'ok', text:Evol.i18n.bOK, class:'btn-primary'}
323+
{id:'cancel', text:Evol.i18n.tools.bCancel, class:'btn-default'},
324+
{id:'ok', text:Evol.i18n.tools.bOK, class:'btn-primary'}
325325
];
326326
}
327327
_.each(buttons, function(b){

0 commit comments

Comments
 (0)