IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2026-09-05 04:40:41 -05:00
Code Issues Packages Projects Releases Wiki Activity

wrapped I18n.lookup to inject the "js" namespace

Browse Source
This commit is contained in:
Régis Hanol
2013-07-09 02:10:55 +02:00
parent e993d6b29b
commit 924c5d65cb
85 changed files with 346 additions and 352 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/assets/javascripts/admin/controllers/admin_customize_controller.js
+2 -2
View File
@@ -14,7 +14,7 @@ Discourse.AdminCustomizeController = Ember.ArrayController.extend({
@method newCustomization
**/
newCustomization: function() {
var item = Discourse.SiteCustomization.create({name: Em.String.i18n("admin.customize.new_style")});
var item = Discourse.SiteCustomization.create({name: I18n.t("admin.customize.new_style")});
this.pushObject(item);
this.set('selectedItem', item);
},
@@ -45,7 +45,7 @@ Discourse.AdminCustomizeController = Ember.ArrayController.extend({
**/
destroy: function() {
var _this = this;
return bootbox.confirm(Em.String.i18n("admin.customize.delete_confirm"), Em.String.i18n("no_value"), Em.String.i18n("yes_value"), function(result) {
return bootbox.confirm(I18n.t("admin.customize.delete_confirm"), I18n.t("no_value"), I18n.t("yes_value"), function(result) {
var selected;
if (result) {
selected = _this.get('selectedItem');
app/assets/javascripts/admin/controllers/admin_flags_controller.js
+4 -4
View File
@@ -19,7 +19,7 @@ Discourse.AdminFlagsController = Ember.ArrayController.extend({
item.disagreeFlags().then((function() {
adminFlagsController.removeObject(item);
}), function() {
bootbox.alert(Em.String.i18n("admin.flags.error"));
bootbox.alert(I18n.t("admin.flags.error"));
});
},
@@ -28,7 +28,7 @@ Discourse.AdminFlagsController = Ember.ArrayController.extend({
item.agreeFlags().then((function() {
adminFlagsController.removeObject(item);
}), function() {
bootbox.alert(Em.String.i18n("admin.flags.error"));
bootbox.alert(I18n.t("admin.flags.error"));
});
},
@@ -37,7 +37,7 @@ Discourse.AdminFlagsController = Ember.ArrayController.extend({
item.deferFlags().then((function() {
adminFlagsController.removeObject(item);
}), function() {
bootbox.alert(Em.String.i18n("admin.flags.error"));
bootbox.alert(I18n.t("admin.flags.error"));
});
},
@@ -52,7 +52,7 @@ Discourse.AdminFlagsController = Ember.ArrayController.extend({
item.deletePost().then((function() {
adminFlagsController.removeObject(item);
}), function() {
bootbox.alert(Em.String.i18n("admin.flags.error"));
bootbox.alert(I18n.t("admin.flags.error"));
});
},
app/assets/javascripts/admin/controllers/admin_user_controller.js
+2 -2
View File
@@ -18,9 +18,9 @@ Discourse.AdminUserController = Discourse.ObjectController.extend({
data: {title: this.get('title')},
type: 'PUT'
}).then(null, function(e){
bootbox.alert(Em.String.i18n("generic_error_with_reason", {error: "http: " + e.status + " - " + e.body}));
bootbox.alert(I18n.t("generic_error_with_reason", {error: "http: " + e.status + " - " + e.body}));
});
this.toggleTitleEdit();
}
});
});
app/assets/javascripts/admin/controllers/admin_users_list_controller.js
+1 -1
View File
@@ -49,7 +49,7 @@ Discourse.AdminUsersListController = Ember.ArrayController.extend(Discourse.Pres
@property title
**/
title: function() {
return Em.String.i18n('admin.users.titles.' + this.get('query'));
return I18n.t('admin.users.titles.' + this.get('query'));
}.property('query'),
/**
app/assets/javascripts/admin/models/admin_api.js
+1 -1
View File
@@ -14,7 +14,7 @@ Discourse.AdminApi = Discourse.Model.extend({
},
regenerateKey: function(){
alert(Em.String.i18n('not_implemented'));
alert(I18n.t('not_implemented'));
}
});
app/assets/javascripts/admin/models/admin_user.js
+18 -18
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',
app/assets/javascripts/admin/models/flagged_post.js
+2 -2
View File
@@ -12,7 +12,7 @@ Discourse.FlaggedPost = Discourse.Post.extend({
return _(this.post_actions)
.groupBy(function(a){ return a.post_action_type_id; })
.map(function(v,k){
return Em.String.i18n('admin.flags.summary.action_type_' + k, {count: v.length});
return I18n.t('admin.flags.summary.action_type_' + k, {count: v.length});
})
.join(',');
}.property(),
@@ -23,7 +23,7 @@ Discourse.FlaggedPost = Discourse.Post.extend({
r = [];
_.each(this.post_actions, function(action) {
var user = _this.userLookup[action.user_id];
var flagType = Em.String.i18n('admin.flags.summary.action_type_' + action.post_action_type_id, {count: 1});
var flagType = I18n.t('admin.flags.summary.action_type_' + action.post_action_type_id, {count: 1});
r.push({user: user, flagType: flagType, flaggedAt: action.created_at});
});
return r;
app/assets/javascripts/admin/models/site_customization.js
+2 -2
View File
@@ -55,7 +55,7 @@ Discourse.SiteCustomization = Discourse.Model.extend({
save: function() {
this.set('savingStatus', Em.String.i18n('saving'));
this.set('savingStatus', I18n.t('saving'));
this.set('saving',true);
var data = {
name: this.name,
@@ -74,7 +74,7 @@ Discourse.SiteCustomization = Discourse.Model.extend({
siteCustomization.set('id', result.id);
siteCustomization.set('key', result.key);
}
siteCustomization.set('savingStatus', Em.String.i18n('saved'));
siteCustomization.set('savingStatus', I18n.t('saved'));
siteCustomization.set('saving',false);
siteCustomization.startTrackingChanges();
});