codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-11-27 09:36:19 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #465 from ZogStriP/extracted-hard-coded-string-in-admin-javascript-files

Browse source 
extracted hard coded strings in the admin javascript files [ci skip]
This commit is contained in:
Robin Ward 2013-03-15 06:49:03 -07:00
commit 7714e2050e
4 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/assets/javascripts/admin/controllers/admin_customize_controller.js
View file

@ -1,11 +1,11 @@
/** /**
This controller supports interface for creating custom CSS skins in Discourse. This controller supports interface for creating custom CSS skins in Discourse.
@class AdminCustomizeController @class AdminCustomizeController
@extends Ember.Controller @extends Ember.Controller
@namespace Discourse @namespace Discourse
@module Discourse @module Discourse
**/ **/
Discourse.AdminCustomizeController = Ember.Controller.extend({ Discourse.AdminCustomizeController = Ember.Controller.extend({
/** /**
@ -14,7 +14,7 @@ Discourse.AdminCustomizeController = Ember.Controller.extend({
@method newCustomization @method newCustomization
**/ **/
newCustomization: function() { newCustomization: function() {
var item = Discourse.SiteCustomization.create({name: 'New Style'}); var item = Discourse.SiteCustomization.create({name: Em.String.i18n("admin.customize.new_style")});
this.get('content').pushObject(item); this.get('content').pushObject(item);
this.set('content.selectedItem', item); this.set('content.selectedItem', item);
}, },

12
app/assets/javascripts/admin/controllers/admin_flags_controller.js
View file

@ -1,13 +1,13 @@
/** /**
This controller supports the interface for dealing with flags in the admin section. This controller supports the interface for dealing with flags in the admin section.
@class AdminFlagsController @class AdminFlagsController
@extends Ember.Controller @extends Ember.Controller
@namespace Discourse @namespace Discourse
@module Discourse @module Discourse
**/ **/
Discourse.AdminFlagsController = Ember.Controller.extend({ Discourse.AdminFlagsController = Ember.Controller.extend({
/** /**
Clear all flags on a post Clear all flags on a post
@ -19,7 +19,7 @@ Discourse.AdminFlagsController = Ember.Controller.extend({
item.clearFlags().then((function() { item.clearFlags().then((function() {
_this.content.removeObject(item); _this.content.removeObject(item);
}), (function() { }), (function() {
bootbox.alert("something went wrong"); bootbox.alert(Em.String.i18n("admin.flags.error"));
})); }));
}, },
@ -34,7 +34,7 @@ Discourse.AdminFlagsController = Ember.Controller.extend({
item.deletePost().then((function() { item.deletePost().then((function() {
_this.content.removeObject(item); _this.content.removeObject(item);
}), (function() { }), (function() {
bootbox.alert("something went wrong"); bootbox.alert(Em.String.i18n("admin.flags.error"));
})); }));
}, },
@ -55,5 +55,5 @@ Discourse.AdminFlagsController = Ember.Controller.extend({
adminActiveFlagsView: (function() { adminActiveFlagsView: (function() {
return this.query === 'active'; return this.query === 'active';
}).property('query') }).property('query')
}); });

2
config/locales/client.en.yml
View file

@ -708,6 +708,7 @@ en:
delete: "Delete Post" delete: "Delete Post"
delete_title: "delete post (if its the first post delete topic)" delete_title: "delete post (if its the first post delete topic)"
flagged_by: "Flagged by" flagged_by: "Flagged by"
error: "Something went wrong"
customize: customize:
title: "Customize" title: "Customize"
@ -719,6 +720,7 @@ en:
undo_preview: "undo preview" undo_preview: "undo preview"
save: "Save" save: "Save"
new: "New" new: "New"
new_style: "New Style"
delete: "Delete" delete: "Delete"
delete_confirm: "Delete this customization?" delete_confirm: "Delete this customization?"

2
config/locales/client.fr.yml
View file

@ -712,6 +712,7 @@ fr:
delete: "Supprimer le message" delete: "Supprimer le message"
delete_title: "supprimer le message (va supprimer la discussion si c'est le premier message)" delete_title: "supprimer le message (va supprimer la discussion si c'est le premier message)"
flagged_by: "Signalé par" flagged_by: "Signalé par"
error: "Quelque chose s'est mal passé"
customize: customize:
title: "Personnaliser" title: "Personnaliser"
@ -723,6 +724,7 @@ fr:
undo_preview: "annuler la prévisualisation" undo_preview: "annuler la prévisualisation"
save: "Sauvegarder" save: "Sauvegarder"
new: "Nouveau" new: "Nouveau"
new_style: "Nouveau style"
delete: "Supprimer" delete: "Supprimer"
delete_confirm: "Supprimer cette personnalisation" delete_confirm: "Supprimer cette personnalisation"