From 5db360afca6b2560e76b355af82835cd6cb1891a Mon Sep 17 00:00:00 2001
From: dcsjapan <dcsjapan@users.noreply.github.com>
Date: Wed, 21 Oct 2015 17:38:53 +0900
Subject: [PATCH] Reorganize key names

See [flarum/core #265](https://github.com/flarum/core/issues/265).

- Adjusts key names to three-tier namespacing.
- Extracts previously unextracted strings.
---
 .../pusher/js/admin/src/components/PusherSettingsModal.js | 8 ++++----
 extensions/pusher/js/forum/src/main.js                    | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/extensions/pusher/js/admin/src/components/PusherSettingsModal.js b/extensions/pusher/js/admin/src/components/PusherSettingsModal.js
index 84278f8ac..9dbf2421e 100644
--- a/extensions/pusher/js/admin/src/components/PusherSettingsModal.js
+++ b/extensions/pusher/js/admin/src/components/PusherSettingsModal.js
@@ -6,23 +6,23 @@ export default class PusherSettingsModal extends SettingsModal {
   }
 
   title() {
-    return 'Pusher Settings';
+    return app.translator.trans('flarum-pusher.admin.pusher_settings.title');
   }
 
   form() {
     return [
       <div className="Form-group">
-        <label>App ID</label>
+        <label>{app.translator.trans('flarum-pusher.admin.pusher_settings.app_id_label')}</label>
         <input className="FormControl" bidi={this.setting('flarum-pusher.app_id')}/>
       </div>,
 
       <div className="Form-group">
-        <label>App Key</label>
+        <label>{app.translator.trans('flarum-pusher.admin.pusher_settings.app_key_label')}</label>
         <input className="FormControl" bidi={this.setting('flarum-pusher.app_key')}/>
       </div>,
 
       <div className="Form-group">
-        <label>App Secret</label>
+        <label>{app.translator.trans('flarum-pusher.admin.pusher_settings.app_secret_label')}</label>
         <input className="FormControl" bidi={this.setting('flarum-pusher.app_secret')}/>
       </div>
     ];
diff --git a/extensions/pusher/js/forum/src/main.js b/extensions/pusher/js/forum/src/main.js
index e8592a2d4..a1934074e 100644
--- a/extensions/pusher/js/forum/src/main.js
+++ b/extensions/pusher/js/forum/src/main.js
@@ -79,7 +79,7 @@ app.initializers.add('flarum-pusher', () => {
               this.loadingUpdated = true;
             },
             loading: this.loadingUpdated,
-            children: app.translator.transChoice('flarum-pusher.forum.show_updated_discussions', count, {count})
+            children: app.translator.transChoice('flarum-pusher.forum.discussion_list.show_updates_text', count, {count})
           })
         );
       }