Permalink
Browse files

Fix error and set default text for loading

  • Loading branch information...
1 parent e4fa3e2 commit 6ec42a14ef2d1adfd8d63f7df614992bc07ddb6a @mitchellsimoens mitchellsimoens committed Jun 18, 2012
Showing with 11 additions and 7 deletions.
  1. +7 −5 Ux/locale/Manager.js
  2. +2 −1 st/locales/en.json
  3. +2 −1 st/locales/fr.json
View
12 Ux/locale/Manager.js
@@ -157,18 +157,20 @@ Ext.define('Ux.locale.Manager', {
},
updateLocale : function(locale) {
- this._language = locale;
+ var me = this;
+
+ me._language = locale;
- if(me._loadingInd){
+ if (me._loadingInd) {
Ext.Viewport.setMasked({
xtype : 'loadmask',
indicator : true,
- message : this.get('misc.loadingLocaleMsg')
+ message : me.get('misc.loadingLocaleMsg', 'Loading...')
});
}
- this.init(function(mngr){
- if(me._loadingInd){
+ me.init(function(mngr) {
+ if (me._loadingInd) {
Ext.Viewport.setMasked(false);
}
});
View
3 st/locales/en.json
@@ -19,7 +19,8 @@
"done" : "Done"
},
"misc" : {
- "bottomTitle" : "Bottom Toolbar"
+ "bottomTitle" : "Bottom Toolbar",
+ "loadLocaleMsg" : "Loading..."
},
"fields" : {
"name" : "Name"
View
3 st/locales/fr.json
@@ -19,7 +19,8 @@
"done" : "Fait"
},
"misc" : {
- "bottomTitle" : "barre d'outils en bas"
+ "bottomTitle" : "barre d'outils en bas",
+ "loadLocaleMsg" : "Chargement en cours ..."
},
"fields" : {
"name" : "Nom"

0 comments on commit 6ec42a1

Please sign in to comment.