Skip to content

Commit 7714e20

Browse files
committed
Merge pull request discourse#465 from ZogStriP/extracted-hard-coded-string-in-admin-javascript-files
extracted hard coded strings in the admin javascript files [ci skip]
2 parents 6e7e5cb + cad55bf commit 7714e20

4 files changed

Lines changed: 13 additions & 9 deletions

File tree

app/assets/javascripts/admin/controllers/admin_customize_controller.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/**
22
This controller supports interface for creating custom CSS skins in Discourse.
33
4-
@class AdminCustomizeController
4+
@class AdminCustomizeController
55
@extends Ember.Controller
66
@namespace Discourse
77
@module Discourse
8-
**/
8+
**/
99
Discourse.AdminCustomizeController = Ember.Controller.extend({
1010

1111
/**
@@ -14,7 +14,7 @@ Discourse.AdminCustomizeController = Ember.Controller.extend({
1414
@method newCustomization
1515
**/
1616
newCustomization: function() {
17-
var item = Discourse.SiteCustomization.create({name: 'New Style'});
17+
var item = Discourse.SiteCustomization.create({name: Em.String.i18n("admin.customize.new_style")});
1818
this.get('content').pushObject(item);
1919
this.set('content.selectedItem', item);
2020
},

app/assets/javascripts/admin/controllers/admin_flags_controller.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
/**
22
This controller supports the interface for dealing with flags in the admin section.
33
4-
@class AdminFlagsController
4+
@class AdminFlagsController
55
@extends Ember.Controller
66
@namespace Discourse
77
@module Discourse
8-
**/
8+
**/
99
Discourse.AdminFlagsController = Ember.Controller.extend({
10-
10+
1111
/**
1212
Clear all flags on a post
1313
@@ -19,7 +19,7 @@ Discourse.AdminFlagsController = Ember.Controller.extend({
1919
item.clearFlags().then((function() {
2020
_this.content.removeObject(item);
2121
}), (function() {
22-
bootbox.alert("something went wrong");
22+
bootbox.alert(Em.String.i18n("admin.flags.error"));
2323
}));
2424
},
2525

@@ -34,7 +34,7 @@ Discourse.AdminFlagsController = Ember.Controller.extend({
3434
item.deletePost().then((function() {
3535
_this.content.removeObject(item);
3636
}), (function() {
37-
bootbox.alert("something went wrong");
37+
bootbox.alert(Em.String.i18n("admin.flags.error"));
3838
}));
3939
},
4040

@@ -55,5 +55,5 @@ Discourse.AdminFlagsController = Ember.Controller.extend({
5555
adminActiveFlagsView: (function() {
5656
return this.query === 'active';
5757
}).property('query')
58-
58+
5959
});

config/locales/client.en.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -708,6 +708,7 @@ en:
708708
delete: "Delete Post"
709709
delete_title: "delete post (if its the first post delete topic)"
710710
flagged_by: "Flagged by"
711+
error: "Something went wrong"
711712

712713
customize:
713714
title: "Customize"
@@ -719,6 +720,7 @@ en:
719720
undo_preview: "undo preview"
720721
save: "Save"
721722
new: "New"
723+
new_style: "New Style"
722724
delete: "Delete"
723725
delete_confirm: "Delete this customization?"
724726

config/locales/client.fr.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -712,6 +712,7 @@ fr:
712712
delete: "Supprimer le message"
713713
delete_title: "supprimer le message (va supprimer la discussion si c'est le premier message)"
714714
flagged_by: "Signalé par"
715+
error: "Quelque chose s'est mal passé"
715716

716717
customize:
717718
title: "Personnaliser"
@@ -723,6 +724,7 @@ fr:
723724
undo_preview: "annuler la prévisualisation"
724725
save: "Sauvegarder"
725726
new: "Nouveau"
727+
new_style: "Nouveau style"
726728
delete: "Supprimer"
727729
delete_confirm: "Supprimer cette personnalisation"
728730

0 commit comments

Comments
 (0)