Skip to content

Commit 2af383f

Browse files
author
Olivier Giulieri
committed
i18n for "'Record saved."
1 parent 2ba968b commit 2af383f

4 files changed

Lines changed: 29 additions & 25 deletions

File tree

‎dist/evolutility.js‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -456,9 +456,17 @@ Evol.i18n = {
456456
//Print:'Print',
457457
//pdf:'PDF',
458458

459+
// --- buttons ---
460+
Save:'Save',
461+
SaveAdd:'Save and Add Another',
462+
Cancel:'Cancel',
463+
459464
// --- msg & status ---
465+
saved: 'Record saved.',
460466
DeleteEntity:'Delete {0} "{1}"?', // {0}=entity {1}=leadfield value,
461467
DeleteEntities: 'Delete {0} {1}?', // delete 5 tasks
468+
NoChange:'No Change',
469+
NoX:'No {0}',
462470
Back2SearchResults:'Back to search results',
463471
yes: 'Yes',
464472
no: 'No',
@@ -473,13 +481,6 @@ Evol.i18n = {
473481
'sgn_money': '$', // indicator for money
474482
'sgn_email': '@', // indicator for email
475483

476-
// --- buttons ---
477-
Save:'Save',
478-
SaveAdd:'Save and Add Another',
479-
Cancel:'Cancel',
480-
NoChange:'No Change',
481-
NoX:'No {0}',
482-
483484
// --- status ---
484485
status:{
485486
added:'New {0} "{1}" added.',
@@ -1562,6 +1563,7 @@ Evol.ViewMany.List = Evol.ViewMany.extend({
15621563
this.$('.table > tbody').html(h.join(''));
15631564
//this.options.pageIndex=pageIdx;
15641565
this.$el.trigger('status', this.pageSummary(pageIdx, pSize, this.collection.length ,uim.entity, uim.entities));
1566+
return this;
15651567
},
15661568

15671569
_HTMLlistBody: function(h, fields, pSize, icon, pageIdx, selectable){
@@ -2911,6 +2913,7 @@ Evol.ViewOne.Wizard = Evol.ViewOne.extend({
29112913
$(d).attr('class', 'badge present');
29122914
}
29132915
});
2916+
return this;
29142917
}
29152918

29162919
});
@@ -4512,7 +4515,7 @@ Evol.ViewToolbar = Backbone.View.extend({
45124515
collec.create(this.getData(), {
45134516
success: function(m){
45144517
fnSuccess(m);
4515-
that.setMessage('Record saved.', Evol.i18n.getLabel('status.added',entityName, _.escape(vw.getTitle())), 'success');
4518+
that.setMessage(Evol.i18n.saved, Evol.i18n.getLabel('status.added',entityName, _.escape(vw.getTitle())), 'success');
45164519
},
45174520
error:function(err){
45184521
alert('error');
@@ -4528,7 +4531,7 @@ Evol.ViewToolbar = Backbone.View.extend({
45284531
this.model.save('','',{
45294532
success: function(m){
45304533
fnSuccess(m);
4531-
that.setMessage('Record saved.', Evol.i18n.getLabel('status.updated', Evol.UI.capitalize(entityName),_.escape(vw.getTitle())), 'success');
4534+
that.setMessage(Evol.i18n.saved, Evol.i18n.getLabel('status.updated', Evol.UI.capitalize(entityName),_.escape(vw.getTitle())), 'success');
45324535
},
45334536
error:function(err){
45344537
alert('error');
@@ -4640,8 +4643,8 @@ Evol.ViewToolbar = Backbone.View.extend({
46404643
action_view: function(evt, actionId){
46414644
switch(actionId){
46424645
case 'cancel':
4643-
if(this.curView.viewName==='edit' && !this.model.isNew){
4644-
this.setView('view');
4646+
if(this.curView.cardinality==='1' && !this.model.isNew){
4647+
this.setView(this._prevOne || 'view');
46454648
}else{
46464649
this.setView(this._prevMany || 'list');
46474650
}

‎dist/evolutility.min.js‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎js/i18n/EN.js‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,17 @@ Evol.i18n = {
4646
//Print:'Print',
4747
//pdf:'PDF',
4848

49+
// --- buttons ---
50+
Save:'Save',
51+
SaveAdd:'Save and Add Another',
52+
Cancel:'Cancel',
53+
4954
// --- msg & status ---
55+
saved: 'Record saved.',
5056
DeleteEntity:'Delete {0} "{1}"?', // {0}=entity {1}=leadfield value,
5157
DeleteEntities: 'Delete {0} {1}?', // delete 5 tasks
58+
NoChange:'No Change',
59+
NoX:'No {0}',
5260
Back2SearchResults:'Back to search results',
5361
yes: 'Yes',
5462
no: 'No',
@@ -63,13 +71,6 @@ Evol.i18n = {
6371
'sgn_money': '$', // indicator for money
6472
'sgn_email': '@', // indicator for email
6573

66-
// --- buttons ---
67-
Save:'Save',
68-
SaveAdd:'Save and Add Another',
69-
Cancel:'Cancel',
70-
NoChange:'No Change',
71-
NoX:'No {0}',
72-
7374
// --- status ---
7475
status:{
7576
added:'New {0} "{1}" added.',

‎js/toolbar.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -476,7 +476,7 @@ Evol.ViewToolbar = Backbone.View.extend({
476476
collec.create(this.getData(), {
477477
success: function(m){
478478
fnSuccess(m);
479-
that.setMessage('Record saved.', Evol.i18n.getLabel('status.added',entityName, _.escape(vw.getTitle())), 'success');
479+
that.setMessage(Evol.i18n.saved, Evol.i18n.getLabel('status.added',entityName, _.escape(vw.getTitle())), 'success');
480480
},
481481
error:function(err){
482482
alert('error');
@@ -492,7 +492,7 @@ Evol.ViewToolbar = Backbone.View.extend({
492492
this.model.save('','',{
493493
success: function(m){
494494
fnSuccess(m);
495-
that.setMessage('Record saved.', Evol.i18n.getLabel('status.updated', Evol.UI.capitalize(entityName),_.escape(vw.getTitle())), 'success');
495+
that.setMessage(Evol.i18n.saved, Evol.i18n.getLabel('status.updated', Evol.UI.capitalize(entityName),_.escape(vw.getTitle())), 'success');
496496
},
497497
error:function(err){
498498
alert('error');
@@ -604,8 +604,8 @@ Evol.ViewToolbar = Backbone.View.extend({
604604
action_view: function(evt, actionId){
605605
switch(actionId){
606606
case 'cancel':
607-
if(this.curView.viewName==='edit' && !this.model.isNew){
608-
this.setView('view');
607+
if(this.curView.cardinality==='1' && !this.model.isNew){
608+
this.setView(this._prevOne || 'view');
609609
}else{
610610
this.setView(this._prevMany || 'list');
611611
}

0 commit comments

Comments
 (0)