wrapped I18n.lookup to inject the "js" namespace

This commit is contained in:
Régis Hanol
2013-07-09 01:32:16 +02:00
parent e993d6b29b
commit 924c5d65cb
85 changed files with 346 additions and 352 deletions

View File

@ -89,7 +89,7 @@ Discourse.AdminUser = Discourse.User.extend({
window.location.reload();
}, function(e) {
// failure
var error = Em.String.i18n('admin.user.trust_level_change_failed', { error: "http: " + e.status + " - " + e.body });
var error = I18n.t('admin.user.trust_level_change_failed', { error: "http: " + e.status + " - " + e.body });
bootbox.alert(error);
});
},
@ -113,7 +113,7 @@ Discourse.AdminUser = Discourse.User.extend({
}).property('banned_till', 'banned_at'),
ban: function() {
var duration = parseInt(window.prompt(Em.String.i18n('admin.user.ban_duration')), 10);
var duration = parseInt(window.prompt(I18n.t('admin.user.ban_duration')), 10);
if (duration > 0) {
Discourse.ajax("/admin/users/" + this.id + "/ban", {
type: 'PUT',
@ -123,7 +123,7 @@ Discourse.AdminUser = Discourse.User.extend({
window.location.reload();
}, function(e) {
// failure
var error = Em.String.i18n('admin.user.ban_failed', { error: "http: " + e.status + " - " + e.body });
var error = I18n.t('admin.user.ban_failed', { error: "http: " + e.status + " - " + e.body });
bootbox.alert(error);
});
}
@ -137,7 +137,7 @@ Discourse.AdminUser = Discourse.User.extend({
window.location.reload();
}, function(e) {
// failed
var error = Em.String.i18n('admin.user.unban_failed', { error: "http: " + e.status + " - " + e.body });
var error = I18n.t('admin.user.unban_failed', { error: "http: " + e.status + " - " + e.body });
bootbox.alert(error);
});
},
@ -152,9 +152,9 @@ Discourse.AdminUser = Discourse.User.extend({
}, function(e) {
// failed
if (e.status === 404) {
bootbox.alert(Em.String.i18n('admin.impersonate.not_found'));
bootbox.alert(I18n.t('admin.impersonate.not_found'));
} else {
bootbox.alert(Em.String.i18n('admin.impersonate.invalid'));
bootbox.alert(I18n.t('admin.impersonate.invalid'));
}
});
},
@ -165,7 +165,7 @@ Discourse.AdminUser = Discourse.User.extend({
window.location.reload();
}, function(e) {
// failed
var error = Em.String.i18n('admin.user.activate_failed', { error: "http: " + e.status + " - " + e.body });
var error = I18n.t('admin.user.activate_failed', { error: "http: " + e.status + " - " + e.body });
bootbox.alert(error);
});
},
@ -176,7 +176,7 @@ Discourse.AdminUser = Discourse.User.extend({
window.location.reload();
}, function(e) {
// failed
var error = Em.String.i18n('admin.user.deactivate_failed', { error: "http: " + e.status + " - " + e.body });
var error = I18n.t('admin.user.deactivate_failed', { error: "http: " + e.status + " - " + e.body });
bootbox.alert(error);
});
},
@ -187,7 +187,7 @@ Discourse.AdminUser = Discourse.User.extend({
window.location.reload();
}, function(e) {
// failed
var error = Em.String.i18n('admin.user.unblock_failed', { error: "http: " + e.status + " - " + e.body });
var error = I18n.t('admin.user.unblock_failed', { error: "http: " + e.status + " - " + e.body });
bootbox.alert(error);
});
},
@ -198,7 +198,7 @@ Discourse.AdminUser = Discourse.User.extend({
window.location.reload();
}, function(e) {
// failed
var error = Em.String.i18n('admin.user.block_failed', { error: "http: " + e.status + " - " + e.body });
var error = I18n.t('admin.user.block_failed', { error: "http: " + e.status + " - " + e.body });
bootbox.alert(error);
});
},
@ -206,10 +206,10 @@ Discourse.AdminUser = Discourse.User.extend({
sendActivationEmail: function() {
Discourse.ajax('/users/' + this.get('username') + '/send_activation_email', {type: 'POST'}).then(function() {
// succeeded
bootbox.alert( Em.String.i18n('admin.user.activation_email_sent') );
bootbox.alert( I18n.t('admin.user.activation_email_sent') );
}, function(e) {
// failed
var error = Em.String.i18n('admin.user.send_activation_email_failed', { error: "http: " + e.status + " - " + e.body });
var error = I18n.t('admin.user.send_activation_email_failed', { error: "http: " + e.status + " - " + e.body });
bootbox.alert(error);
});
},
@ -220,7 +220,7 @@ Discourse.AdminUser = Discourse.User.extend({
deleteButtonTitle: function() {
if (this.get('deleteForbidden')) {
return Em.String.i18n('admin.user.delete_forbidden');
return I18n.t('admin.user.delete_forbidden');
} else {
return null;
}
@ -228,22 +228,22 @@ Discourse.AdminUser = Discourse.User.extend({
destroy: function() {
var user = this;
bootbox.confirm(Em.String.i18n("admin.user.delete_confirm"), Em.String.i18n("no_value"), Em.String.i18n("yes_value"), function(result) {
bootbox.confirm(I18n.t("admin.user.delete_confirm"), I18n.t("no_value"), I18n.t("yes_value"), function(result) {
if(result) {
Discourse.ajax("/admin/users/" + user.get('id') + '.json', { type: 'DELETE' }).then(function(data) {
if (data.deleted) {
bootbox.alert(Em.String.i18n("admin.user.deleted"), function() {
bootbox.alert(I18n.t("admin.user.deleted"), function() {
document.location = "/admin/users/list/active";
});
} else {
bootbox.alert(Em.String.i18n("admin.user.delete_failed"));
bootbox.alert(I18n.t("admin.user.delete_failed"));
if (data.user) {
user.mergeAttributes(data.user);
}
}
}, function(jqXHR, status, error) {
Discourse.AdminUser.find( user.get('username') ).then(function(u){ user.mergeAttributes(u); });
bootbox.alert(Em.String.i18n("admin.user.delete_failed"));
bootbox.alert(I18n.t("admin.user.delete_failed"));
});
}
});
@ -270,7 +270,7 @@ Discourse.AdminUser.reopenClass({
return user.set('selected', false);
});
bootbox.alert(Em.String.i18n("admin.user.approve_bulk_success"));
bootbox.alert(I18n.t("admin.user.approve_bulk_success"));
return Discourse.ajax("/admin/users/approve-bulk", {
type: 'PUT',