diff --git a/app/assets/javascripts/admin/templates/admin.hbs b/app/assets/javascripts/admin/templates/admin.hbs
index 09eadbdb7..27f4ec301 100644
--- a/app/assets/javascripts/admin/templates/admin.hbs
+++ b/app/assets/javascripts/admin/templates/admin.hbs
@@ -4,24 +4,24 @@
     <div class="full-width">
 
       <ul class="nav nav-pills">
-        <li>{{#link-to 'admin.dashboard'}}{{i18n admin.dashboard.title}}{{/link-to}}</li>
+        <li>{{#link-to 'admin.dashboard'}}{{i18n 'admin.dashboard.title'}}{{/link-to}}</li>
         {{#if currentUser.admin}}
-          <li>{{#link-to 'adminSiteSettings'}}{{i18n admin.site_settings.title}}{{/link-to}}</li>
+          <li>{{#link-to 'adminSiteSettings'}}{{i18n 'admin.site_settings.title'}}{{/link-to}}</li>
         {{/if}}
-        <li>{{#link-to 'adminUsersList.show' 'active'}}{{i18n admin.users.title}}{{/link-to}}</li>
+        <li>{{#link-to 'adminUsersList.show' 'active'}}{{i18n 'admin.users.title'}}{{/link-to}}</li>
         {{#if showBadges}}
-          <li>{{#link-to 'adminBadges.index'}}{{i18n admin.badges.title}}{{/link-to}}</li>
+          <li>{{#link-to 'adminBadges.index'}}{{i18n 'admin.badges.title'}}{{/link-to}}</li>
         {{/if}}
         {{#if currentUser.admin}}
-          <li>{{#link-to 'adminGroups.index'}}{{i18n admin.groups.title}}{{/link-to}}</li>
+          <li>{{#link-to 'adminGroups.index'}}{{i18n 'admin.groups.title'}}{{/link-to}}</li>
         {{/if}}
-        <li>{{#link-to 'adminEmail'}}{{i18n admin.email.title}}{{/link-to}}</li>
-        <li>{{#link-to 'adminFlags'}}{{i18n admin.flags.title}}{{/link-to}}</li>
-        <li>{{#link-to 'adminLogs'}}{{i18n admin.logs.title}}{{/link-to}}</li>
+        <li>{{#link-to 'adminEmail'}}{{i18n 'admin.email.title'}}{{/link-to}}</li>
+        <li>{{#link-to 'adminFlags'}}{{i18n 'admin.flags.title'}}{{/link-to}}</li>
+        <li>{{#link-to 'adminLogs'}}{{i18n 'admin.logs.title'}}{{/link-to}}</li>
         {{#if currentUser.admin}}
-          <li>{{#link-to 'adminCustomize.colors'}}{{i18n admin.customize.title}}{{/link-to}}</li>
-          <li>{{#link-to 'admin.api'}}{{i18n admin.api.title}}{{/link-to}}</li>
-          <li>{{#link-to 'admin.backups'}}{{i18n admin.backups.title}}{{/link-to}}</li>
+          <li>{{#link-to 'adminCustomize.colors'}}{{i18n 'admin.customize.title'}}{{/link-to}}</li>
+          <li>{{#link-to 'admin.api'}}{{i18n 'admin.api.title'}}{{/link-to}}</li>
+          <li>{{#link-to 'admin.backups'}}{{i18n 'admin.backups.title'}}{{/link-to}}</li>
         {{/if}}
       </ul>
 
diff --git a/app/assets/javascripts/admin/templates/api.hbs b/app/assets/javascripts/admin/templates/api.hbs
index 3807e1e68..13267da91 100644
--- a/app/assets/javascripts/admin/templates/api.hbs
+++ b/app/assets/javascripts/admin/templates/api.hbs
@@ -1,8 +1,8 @@
 {{#if model}}
   <table class='api-keys'>
   <tr>
-    <th>{{i18n admin.api.key}}</th>
-    <th>{{i18n admin.api.user}}</th>
+    <th>{{i18n 'admin.api.key'}}</th>
+    <th>{{i18n 'admin.api.user'}}</th>
     <th>&nbsp;</th>
   </tr>
   {{#each model}}
@@ -14,20 +14,20 @@
             {{avatar user imageSize="small"}}
           {{/link-to}}
         {{else}}
-          {{i18n admin.api.all_users}}
+          {{i18n 'admin.api.all_users'}}
         {{/if}}
       </td>
       <td>
-        <button class='btn' {{action "regenerateKey" this}}><i class="fa fa-undo"></i>{{i18n admin.api.regenerate}}</button>
-        <button class='btn' {{action "revokeKey" this}}><i class="fa fa-times"></i>{{i18n admin.api.revoke}}</button>
+        <button class='btn' {{action "regenerateKey" this}}><i class="fa fa-undo"></i>{{i18n 'admin.api.regenerate'}}</button>
+        <button class='btn' {{action "revokeKey" this}}><i class="fa fa-times"></i>{{i18n 'admin.api.revoke'}}</button>
       </td>
     </tr>
   {{/each}}
   </table>
 {{else}}
-  <p>{{i18n admin.api.none}}</p>
+  <p>{{i18n 'admin.api.none'}}</p>
 {{/if}}
 
 {{#unless hasMasterKey}}
-  <button class='btn' {{action "generateMasterKey"}}><i class="fa fa-key"></i>{{i18n admin.api.generate_master}}</button>
+  <button class='btn' {{action "generateMasterKey"}}><i class="fa fa-key"></i>{{i18n 'admin.api.generate_master'}}</button>
 {{/unless }}
diff --git a/app/assets/javascripts/admin/templates/backups.hbs b/app/assets/javascripts/admin/templates/backups.hbs
index 3ccbfce80..e700cff02 100644
--- a/app/assets/javascripts/admin/templates/backups.hbs
+++ b/app/assets/javascripts/admin/templates/backups.hbs
@@ -1,18 +1,18 @@
 <div class="admin-controls">
   <div class="span15">
     <ul class="nav nav-pills">
-      <li>{{#link-to "admin.backups.index"}}{{i18n admin.backups.menu.backups}}{{/link-to}}</li>
-      <li>{{#link-to "admin.backups.logs"}}{{i18n admin.backups.menu.logs}}{{/link-to}}</li>
+      <li>{{#link-to "admin.backups.index"}}{{i18n 'admin.backups.menu.backups'}}{{/link-to}}</li>
+      <li>{{#link-to "admin.backups.logs"}}{{i18n 'admin.backups.menu.logs'}}{{/link-to}}</li>
     </ul>
   </div>
   <div class="pull-right">
     {{#if canRollback}}
-      <button {{action "rollback"}} class="btn btn-rollback" title="{{i18n admin.backups.operations.rollback.title}}" {{bind-attr disabled="rollbackDisabled"}}><i class="fa fa-ambulance fa-flip-horizontal"></i>{{i18n admin.backups.operations.rollback.text}}</button>
+      <button {{action "rollback"}} class="btn btn-rollback" title="{{i18n 'admin.backups.operations.rollback.title'}}" {{bind-attr disabled="rollbackDisabled"}}><i class="fa fa-ambulance fa-flip-horizontal"></i>{{i18n 'admin.backups.operations.rollback.text'}}</button>
     {{/if}}
     {{#if isOperationRunning}}
-      <button {{action "cancelOperation"}} class="btn btn-danger" title="{{i18n admin.backups.operations.cancel.title}}"><i class="fa fa-times"></i>{{i18n admin.backups.operations.cancel.text}}</button>
+      <button {{action "cancelOperation"}} class="btn btn-danger" title="{{i18n 'admin.backups.operations.cancel.title'}}"><i class="fa fa-times"></i>{{i18n 'admin.backups.operations.cancel.text'}}</button>
     {{else}}
-      <button {{action "startBackup"}} class="btn btn-primary" title="{{i18n admin.backups.operations.backup.title}}"><i class="fa fa-rocket"></i>{{i18n admin.backups.operations.backup.text}}</button>
+      <button {{action "startBackup"}} class="btn btn-primary" title="{{i18n 'admin.backups.operations.backup.title'}}"><i class="fa fa-rocket"></i>{{i18n 'admin.backups.operations.backup.text'}}</button>
     {{/if}}
   </div>
 </div>
diff --git a/app/assets/javascripts/admin/templates/backups_index.hbs b/app/assets/javascripts/admin/templates/backups_index.hbs
index 486bf3027..bfbedd1be 100644
--- a/app/assets/javascripts/admin/templates/backups_index.hbs
+++ b/app/assets/javascripts/admin/templates/backups_index.hbs
@@ -1,7 +1,7 @@
 <table>
   <tr>
-    <th width="55%">{{i18n admin.backups.columns.filename}}</th>
-    <th width="10%">{{i18n admin.backups.columns.size}}</th>
+    <th width="55%">{{i18n 'admin.backups.columns.filename'}}</th>
+    <th width="10%">{{i18n 'admin.backups.columns.size'}}</th>
     <th>
       <div class="pull-right">
         {{resumable-upload target="/admin/backups/upload" success="uploadSuccess" error="uploadError" uploadText=uploadText}}
@@ -15,15 +15,15 @@
       <td>{{human-size backup.size}}</td>
       <td>
         <div class="pull-right">
-          <a {{bind-attr href="backup.link"}} class="btn download" title="{{i18n admin.backups.operations.download.title}}"><i class="fa fa-download"></i>{{i18n admin.backups.operations.download.text}}</a>
+          <a {{bind-attr href="backup.link"}} class="btn download" title="{{i18n 'admin.backups.operations.download.title'}}"><i class="fa fa-download"></i>{{i18n 'admin.backups.operations.download.text'}}</a>
           <button {{action "destroyBackup" backup}} class="btn btn-danger no-text" {{bind-attr disabled="destroyDisabled" title="destroyTitle"}}><i class="fa fa-trash-o"></i></button>
-          <button {{action "startRestore" backup}} class="btn" {{bind-attr disabled="restoreDisabled" title="restoreTitle"}}><i class="fa fa-play"></i>{{i18n admin.backups.operations.restore.text}}</button>
+          <button {{action "startRestore" backup}} class="btn" {{bind-attr disabled="restoreDisabled" title="restoreTitle"}}><i class="fa fa-play"></i>{{i18n 'admin.backups.operations.restore.text'}}</button>
         </div>
       </td>
     </tr>
   {{else}}
     <tr>
-      <td>{{i18n admin.backups.none}}</td>
+      <td>{{i18n 'admin.backups.none'}}</td>
       <td></td>
       <td></td>
     </tr>
diff --git a/app/assets/javascripts/admin/templates/badges-index.hbs b/app/assets/javascripts/admin/templates/badges-index.hbs
index 5bb47c217..fcb54478d 100644
--- a/app/assets/javascripts/admin/templates/badges-index.hbs
+++ b/app/assets/javascripts/admin/templates/badges-index.hbs
@@ -1,9 +1,9 @@
 <div class='span13'>
-  <p>{{i18n admin.badges.none_selected}}</p>
+  <p>{{i18n 'admin.badges.none_selected'}}</p>
 
   <div>
     {{#link-to 'adminBadges.show' 'new' class="btn"}}
-      {{fa-icon "plus"}} {{i18n admin.badges.new}}
+      {{fa-icon "plus"}} {{i18n 'admin.badges.new'}}
     {{/link-to}}
   </div>
 </div>
diff --git a/app/assets/javascripts/admin/templates/badges-show.hbs b/app/assets/javascripts/admin/templates/badges-show.hbs
index e12957320..79b2589ff 100644
--- a/app/assets/javascripts/admin/templates/badges-show.hbs
+++ b/app/assets/javascripts/admin/templates/badges-show.hbs
@@ -1,31 +1,31 @@
 <div class='current-badge span13'>
   <form class="form-horizontal">
     <div>
-      <label for="name">{{i18n admin.badges.name}}</label>
+      <label for="name">{{i18n 'admin.badges.name'}}</label>
       {{input type="text" name="name" value=buffered.name}}
     </div>
 
     {{#if showDisplayName}}
       <div>
-        <strong>{{i18n admin.badges.display_name}}</strong>
+        <strong>{{i18n 'admin.badges.display_name'}}</strong>
         {{buffered.displayName}}
       </div>
     {{/if}}
 
     <div>
-      <label for="name">{{i18n admin.badges.icon}}</label>
+      <label for="name">{{i18n 'admin.badges.icon'}}</label>
       {{input type="text" name="name" value=buffered.icon}}
-      <p class='help'>{{i18n admin.badges.icon_help}}</p>
+      <p class='help'>{{i18n 'admin.badges.icon_help'}}</p>
     </div>
 
     <div>
-      <label for="name">{{i18n admin.badges.image}}</label>
+      <label for="name">{{i18n 'admin.badges.image'}}</label>
       {{input type="text" name="name" value=buffered.image}}
-      <p class='help'>{{i18n admin.badges.icon_help}}</p>
+      <p class='help'>{{i18n 'admin.badges.icon_help'}}</p>
     </div>
 
     <div>
-      <label for="badge_type_id">{{i18n admin.badges.badge_type}}</label>
+      <label for="badge_type_id">{{i18n 'admin.badges.badge_type'}}</label>
       {{view Ember.Select name="badge_type_id"
                           value=buffered.badge_type_id
                           content=badgeTypes
@@ -35,7 +35,7 @@
     </div>
 
     <div>
-      <label for="badge_grouping_id">{{i18n admin.badges.badge_grouping}}</label>
+      <label for="badge_grouping_id">{{i18n 'admin.badges.badge_grouping'}}</label>
       {{view Ember.Select name="badge_grouping_id"
                           value=buffered.badge_grouping_id
                           content=badgeGroupings
@@ -46,7 +46,7 @@
 
 
     <div>
-      <label for="description">{{i18n admin.badges.description}}</label>
+      <label for="description">{{i18n 'admin.badges.description'}}</label>
       {{#if canEditDescription}}
         {{textarea name="description" value=buffered.description}}
       {{else}}
@@ -55,34 +55,34 @@
     </div>
 
     <div>
-      <label for="query">{{i18n admin.badges.query}}</label>
+      <label for="query">{{i18n 'admin.badges.query'}}</label>
       {{textarea name="query" value=buffered.query disabled=readOnly}}
     </div>
 
     {{#if hasQuery}}
-      <a href {{action "preview" buffered "false"}}>{{i18n admin.badges.preview.link_text}}</a>
+      <a href {{action "preview" buffered "false"}}>{{i18n 'admin.badges.preview.link_text'}}</a>
       |
-      <a href {{action "preview" buffered "true"}}>{{i18n admin.badges.preview.plan_text}}</a>
+      <a href {{action "preview" buffered "true"}}>{{i18n 'admin.badges.preview.plan_text'}}</a>
       {{#if preview_loading}}
-        {{i18n loading}}...
+        {{i18n 'loading'}}...
       {{/if}}
 
       <div>
         <label>
           {{input type="checkbox" checked=buffered.auto_revoke disabled=readOnly}}
-          {{i18n admin.badges.auto_revoke}}
+          {{i18n 'admin.badges.auto_revoke'}}
         </label>
       </div>
 
       <div>
         <label>
           {{input type="checkbox" checked=buffered.target_posts disabled=readOnly}}
-          {{i18n admin.badges.target_posts}}
+          {{i18n 'admin.badges.target_posts'}}
         </label>
       </div>
 
       <div>
-        <label for="trigger">{{i18n admin.badges.trigger}}</label>
+        <label for="trigger">{{i18n 'admin.badges.trigger'}}</label>
         {{view Ember.Select name="trigger"
                             value=buffered.trigger
                             content=badgeTriggers
@@ -95,43 +95,43 @@
     <div>
       <label>
         {{input type="checkbox" checked=buffered.allow_title}}
-        {{i18n admin.badges.allow_title}}
+        {{i18n 'admin.badges.allow_title'}}
       </label>
     </div>
 
     <div>
       <label>
         {{input type="checkbox" checked=buffered.multiple_grant disabled=readOnly}}
-        {{i18n admin.badges.multiple_grant}}
+        {{i18n 'admin.badges.multiple_grant'}}
       </label>
     </div>
 
     <div>
       <label>
         {{input type="checkbox" checked=buffered.listable disabled=readOnly}}
-        {{i18n admin.badges.listable}}
+        {{i18n 'admin.badges.listable'}}
       </label>
     </div>
 
     <div>
       <label>
         {{input type="checkbox" checked=buffered.show_posts disabled=readOnly}}
-        {{i18n admin.badges.show_posts}}
+        {{i18n 'admin.badges.show_posts'}}
       </label>
     </div>
 
     <div>
       <label>
         {{input type="checkbox" checked=buffered.enabled}}
-        {{i18n admin.badges.enabled}}
+        {{i18n 'admin.badges.enabled'}}
       </label>
     </div>
 
     <div class='buttons'>
-      <button {{action "save"}} {{bind-attr disabled=saving}} class='btn btn-primary'>{{i18n admin.badges.save}}</button>
+      <button {{action "save"}} {{bind-attr disabled=saving}} class='btn btn-primary'>{{i18n 'admin.badges.save'}}</button>
       <span class='saving'>{{savingStatus}}</span>
       {{#unless readOnly}}
-        <a {{action "destroy"}} class='delete-link'>{{i18n admin.badges.delete}}</a>
+        <a {{action "destroy"}} class='delete-link'>{{i18n 'admin.badges.delete'}}</a>
       {{/unless}}
     </div>
   </form>
@@ -140,7 +140,7 @@
 {{#if grant_count}}
   <div class="span13 current-badge-actions">
     <div>
-      {{#link-to 'badges.show' this}}{{i18n badges.granted count=grant_count}}{{/link-to}}
+      {{#link-to 'badges.show' this}}{{i18n 'badges.granted' count=grant_count}}{{/link-to}}
     </div>
   </div>
 {{/if}}
diff --git a/app/assets/javascripts/admin/templates/badges.hbs b/app/assets/javascripts/admin/templates/badges.hbs
index fe2d7ce80..efee80a60 100644
--- a/app/assets/javascripts/admin/templates/badges.hbs
+++ b/app/assets/javascripts/admin/templates/badges.hbs
@@ -1,21 +1,21 @@
 <div class="badges">
 
   <div class='content-list span6'>
-    <h3>{{i18n admin.badges.title}}</h3>
+    <h3>{{i18n 'admin.badges.title'}}</h3>
     <ul>
       {{#each}}
       <li>
         {{#link-to 'adminBadges.show' id}}
           {{badge-button badge=this}}
           {{#if newBadge}}
-            <span class="list-badge">{{i18n filters.new.lower_title}}</span>
+            <span class="list-badge">{{i18n 'filters.new.lower_title'}}</span>
           {{/if}}
         {{/link-to}}
       </li>
       {{/each}}
     </ul>
     {{#link-to 'adminBadges.show' 'new' class="btn"}}
-      {{fa-icon "plus"}} {{i18n admin.badges.new}}
+      {{fa-icon "plus"}} {{i18n 'admin.badges.new'}}
     {{/link-to}}
     <br>
     <br>
diff --git a/app/assets/javascripts/admin/templates/customize.hbs b/app/assets/javascripts/admin/templates/customize.hbs
index 8ac29110e..6b0c1214b 100644
--- a/app/assets/javascripts/admin/templates/customize.hbs
+++ b/app/assets/javascripts/admin/templates/customize.hbs
@@ -1,10 +1,10 @@
 <div class='admin-controls'>
   <div class='span15'>
     <ul class="nav nav-pills">
-      <li>{{#link-to 'adminCustomize.colors'}}{{i18n admin.customize.colors.title}}{{/link-to}}</li>
-      <li>{{#link-to 'adminCustomize.css_html'}}{{i18n admin.customize.css_html.title}}{{/link-to}}</li>
-      <li>{{#link-to 'adminSiteText'}}{{i18n admin.site_text.title}}{{/link-to}}</li>
-      <li>{{#link-to 'adminUserFields'}}{{i18n admin.user_fields.title}}{{/link-to}}</li>
+      <li>{{#link-to 'adminCustomize.colors'}}{{i18n 'admin.customize.colors.title'}}{{/link-to}}</li>
+      <li>{{#link-to 'adminCustomize.css_html'}}{{i18n 'admin.customize.css_html.title'}}{{/link-to}}</li>
+      <li>{{#link-to 'adminSiteText'}}{{i18n 'admin.site_text.title'}}{{/link-to}}</li>
+      <li>{{#link-to 'adminUserFields'}}{{i18n 'admin.user_fields.title'}}{{/link-to}}</li>
     </ul>
   </div>
 </div>
diff --git a/app/assets/javascripts/admin/templates/customize_colors.hbs b/app/assets/javascripts/admin/templates/customize_colors.hbs
index 2f35d97e3..c82b5cd9a 100644
--- a/app/assets/javascripts/admin/templates/customize_colors.hbs
+++ b/app/assets/javascripts/admin/templates/customize_colors.hbs
@@ -1,5 +1,5 @@
 <div class='content-list span6'>
-  <h3>{{i18n admin.customize.colors.long_title}}</h3>
+  <h3>{{i18n 'admin.customize.colors.long_title'}}</h3>
   <ul>
     {{#each model}}
       {{#unless is_base}}
@@ -7,7 +7,7 @@
       {{/unless}}
     {{/each}}
   </ul>
-  <button {{action "newColorScheme"}} class='btn'><i class="fa fa-plus"></i>{{i18n admin.customize.new}}</button>
+  <button {{action "newColorScheme"}} class='btn'><i class="fa fa-plus"></i>{{i18n 'admin.customize.new'}}</button>
 </div>
 
 {{#if selectedItem}}
@@ -17,16 +17,16 @@
         <h1>{{text-field class="style-name" value=name}}</h1>
 
         <div class="controls">
-          <button {{action "save"}} {{bind-attr disabled="disableSave"}} class='btn'>{{i18n admin.customize.save}}</button>
+          <button {{action "save"}} {{bind-attr disabled="disableSave"}} class='btn'>{{i18n 'admin.customize.save'}}</button>
           <button {{action "toggleEnabled"}} {{bind-attr disabled="disableEnable"}} class="btn">
             {{#if enabled}}
-              {{i18n disable}}
+              {{i18n 'disable'}}
             {{else}}
-              {{i18n enable}}
+              {{i18n 'enable'}}
             {{/if}}
           </button>
-          <button {{action "copy" this}} class='btn'><i class="fa fa-copy"></i> {{i18n admin.customize.copy}}</button>
-          <button {{action "destroy"}} class='btn btn-danger'><i class="fa fa-trash-o"></i> {{i18n admin.customize.delete}}</button>
+          <button {{action "copy" this}} class='btn'><i class="fa fa-copy"></i> {{i18n 'admin.customize.copy'}}</button>
+          <button {{action "destroy"}} class='btn btn-danger'><i class="fa fa-trash-o"></i> {{i18n 'admin.customize.delete'}}</button>
           <span {{bind-attr class=":saving savingStatus::hidden" }}>{{savingStatus}}</span>
         </div>
       {{/with}}
@@ -37,7 +37,7 @@
         <div class='search controls'>
           <label>
             {{input type="checkbox" checked=onlyOverridden}}
-            {{i18n admin.site_settings.show_overriden}}
+            {{i18n 'admin.site_settings.show_overriden'}}
           </label>
         </div>
       </div>
@@ -47,7 +47,7 @@
         <thead>
           <tr>
             <th></th>
-            <th class="hex">{{i18n admin.customize.color}}</th>
+            <th class="hex">{{i18n 'admin.customize.color'}}</th>
             <th></th>
           </tr>
         </thead>
@@ -61,20 +61,20 @@
               </td>
               <td class="hex">{{color-input hexValue=hex brightnessValue=brightness valid=valid}}</td>
               <td class="actions">
-                <button {{bind-attr class=":btn :revert savedIsOverriden::invisible"}} {{action "revert" this}} title="{{i18n admin.customize.colors.revert_title}}">{{i18n revert}}</button>
-                <button {{bind-attr class=":btn :undo changed::invisible"}} {{action "undo" this}} title="{{i18n admin.customize.colors.undo_title}}">{{i18n undo}}</button>
+                <button {{bind-attr class=":btn :revert savedIsOverriden::invisible"}} {{action "revert" this}} title="{{i18n 'admin.customize.colors.revert_title'}}">{{i18n 'revert'}}</button>
+                <button {{bind-attr class=":btn :undo changed::invisible"}} {{action "undo" this}} title="{{i18n 'admin.customize.colors.undo_title'}}">{{i18n 'undo'}}</button>
               </td>
             </tr>
           {{/each}}
         </tbody>
       </table>
       {{else}}
-        <p>{{i18n search.no_results}}</p>
+        <p>{{i18n 'search.no_results'}}</p>
       {{/if}}
     </div>
   </div>
 {{else}}
-  <p class="about">{{i18n admin.customize.colors.about}}</p>
+  <p class="about">{{i18n 'admin.customize.colors.about'}}</p>
 {{/if}}
 
 <div class="clearfix"></div>
diff --git a/app/assets/javascripts/admin/templates/customize_css_html.hbs b/app/assets/javascripts/admin/templates/customize_css_html.hbs
index 57bccda49..28c1b8cce 100644
--- a/app/assets/javascripts/admin/templates/customize_css_html.hbs
+++ b/app/assets/javascripts/admin/templates/customize_css_html.hbs
@@ -1,12 +1,12 @@
 <div class='content-list span6'>
-  <h3>{{i18n admin.customize.css_html.long_title}}</h3>
+  <h3>{{i18n 'admin.customize.css_html.long_title'}}</h3>
   <ul>
     {{#each model}}
       <li><a {{action "selectStyle" this}} {{bind-attr class="this.selected:active"}}>{{this.description}}</a></li>
     {{/each}}
   </ul>
   <button {{action "newCustomization"}} class='btn'>
-    {{fa-icon "plus"}}{{i18n admin.customize.new}}
+    {{fa-icon "plus"}}{{i18n 'admin.customize.new'}}
   </button>
 </div>
 
@@ -17,12 +17,12 @@
 
       <div class='admin-controls'>
         <ul class="nav nav-pills">
-          <li><a {{bind-attr class="view.stylesheetActive:active"}} {{action "selectStylesheet" target="view"}}>{{i18n admin.customize.css}}</a></li>
-          <li><a {{bind-attr class="view.headerActive:active"}} {{action "selectHeader" target="view"}}>{{i18n admin.customize.header}}</a></li>
-          <li><a {{bind-attr class="view.footerActive:active"}} {{action "selectFooter" target="view"}}>{{i18n admin.customize.footer}}</a></li>
-          <li><a {{bind-attr class="view.mobileStylesheetActive:active"}} {{action "selectMobileStylesheet" target="view"}}>{{fa-icon "mobile"}}&nbsp;{{i18n admin.customize.css}}</a></li>
-          <li><a {{bind-attr class="view.mobileHeaderActive:active"}} {{action "selectMobileHeader" target="view"}}>{{fa-icon "mobile"}}&nbsp;{{i18n admin.customize.header}}</a></li>
-          <li><a {{bind-attr class="view.mobileFooterActive:active"}} {{action "selectMobileFooter" target="view"}}>{{fa-icon "mobile"}}&nbsp;{{i18n admin.customize.footer}}</a></li>
+          <li><a {{bind-attr class="view.stylesheetActive:active"}} {{action "selectStylesheet" target="view"}}>{{i18n 'admin.customize.css'}}</a></li>
+          <li><a {{bind-attr class="view.headerActive:active"}} {{action "selectHeader" target="view"}}>{{i18n 'admin.customize.header'}}</a></li>
+          <li><a {{bind-attr class="view.footerActive:active"}} {{action "selectFooter" target="view"}}>{{i18n 'admin.customize.footer'}}</a></li>
+          <li><a {{bind-attr class="view.mobileStylesheetActive:active"}} {{action "selectMobileStylesheet" target="view"}}>{{fa-icon "mobile"}}&nbsp;{{i18n 'admin.customize.css'}}</a></li>
+          <li><a {{bind-attr class="view.mobileHeaderActive:active"}} {{action "selectMobileHeader" target="view"}}>{{fa-icon "mobile"}}&nbsp;{{i18n 'admin.customize.header'}}</a></li>
+          <li><a {{bind-attr class="view.mobileFooterActive:active"}} {{action "selectMobileFooter" target="view"}}>{{fa-icon "mobile"}}&nbsp;{{i18n 'admin.customize.footer'}}</a></li>
         </ul>
       </div>
 
@@ -37,23 +37,23 @@
     {{/with}}
     <br>
     <div class='status-actions'>
-      <span>{{i18n admin.customize.override_default}} {{view Ember.Checkbox checkedBinding="selectedItem.override_default_style"}}</span>
-      <span>{{i18n admin.customize.enabled}}  {{view Ember.Checkbox checkedBinding="selectedItem.enabled"}}</span>
+      <span>{{i18n 'admin.customize.override_default'}} {{view Ember.Checkbox checkedBinding="selectedItem.override_default_style"}}</span>
+      <span>{{i18n 'admin.customize.enabled'}}  {{view Ember.Checkbox checkedBinding="selectedItem.enabled"}}</span>
       {{#unless selectedItem.changed}}
-      <a class='preview-link' {{bind-attr href="selectedItem.previewUrl"}} target='_blank' title="{{i18n admin.customize.explain_preview}}">{{i18n admin.customize.preview}}</a>
+      <a class='preview-link' {{bind-attr href="selectedItem.previewUrl"}} target='_blank' title="{{i18n 'admin.customize.explain_preview'}}">{{i18n 'admin.customize.preview'}}</a>
       |
-      <a href="/?preview-style=" target='_blank' title="{{i18n admin.customize.explain_undo_preview}}">{{i18n admin.customize.undo_preview}}</a>
+      <a href="/?preview-style=" target='_blank' title="{{i18n 'admin.customize.explain_undo_preview'}}">{{i18n 'admin.customize.undo_preview'}}</a>
       |
-      <a href="/?preview-style=default" target='_blank' title="{{i18n admin.customize.explain_rescue_preview}}">{{i18n admin.customize.rescue_preview}}</a><br>
+      <a href="/?preview-style=default" target='_blank' title="{{i18n 'admin.customize.explain_rescue_preview'}}">{{i18n 'admin.customize.rescue_preview'}}</a><br>
       {{/unless}}
     </div>
 
     <div class='buttons'>
-      <button {{action "save"}} {{bind-attr disabled="selectedItem.disableSave"}} class='btn'>{{i18n admin.customize.save}}</button>
+      <button {{action "save"}} {{bind-attr disabled="selectedItem.disableSave"}} class='btn'>{{i18n 'admin.customize.save'}}</button>
       <span class='saving'>{{selectedItem.savingStatus}}</span>
-      <a {{action "destroy"}} class='delete-link'>{{i18n admin.customize.delete}}</a>
+      <a {{action "destroy"}} class='delete-link'>{{i18n 'admin.customize.delete'}}</a>
     </div>
   </div>
 {{else}}
-  <p class="about">{{i18n admin.customize.about}}</p>
+  <p class="about">{{i18n 'admin.customize.about'}}</p>
 {{/if}}
diff --git a/app/assets/javascripts/admin/templates/dashboard.hbs b/app/assets/javascripts/admin/templates/dashboard.hbs
index 97d0390de..4438803dc 100644
--- a/app/assets/javascripts/admin/templates/dashboard.hbs
+++ b/app/assets/javascripts/admin/templates/dashboard.hbs
@@ -24,15 +24,15 @@
   <div class="dashboard-stats totals">
     <table>
       <tr>
-        <td class="title"><i class='fa fa-shield'></i> {{i18n admin.dashboard.admins}}</td>
+        <td class="title"><i class='fa fa-shield'></i> {{i18n 'admin.dashboard.admins'}}</td>
         <td class="value">{{#link-to 'adminUsersList.show' 'admins'}}{{admins}}{{/link-to}}</td>
-        <td class="title"><i class='fa fa-ban'></i> {{i18n admin.dashboard.suspended}}</td>
+        <td class="title"><i class='fa fa-ban'></i> {{i18n 'admin.dashboard.suspended'}}</td>
         <td class="value">{{#link-to 'adminUsersList.show' 'suspended'}}{{suspended}}{{/link-to}}</td>
       </tr>
       <tr>
-        <td class="title"><i class='fa fa-shield'></i> {{i18n admin.dashboard.moderators}}</td>
+        <td class="title"><i class='fa fa-shield'></i> {{i18n 'admin.dashboard.moderators'}}</td>
         <td class="value">{{#link-to 'adminUsersList.show' 'moderators'}}{{moderators}}{{/link-to}}</td>
-        <td class="title"><i class='fa fa-ban'></i> {{i18n admin.dashboard.blocked}}</td>
+        <td class="title"><i class='fa fa-ban'></i> {{i18n 'admin.dashboard.blocked'}}</td>
         <td class="value">{{#link-to 'adminUsersList.show' 'blocked'}}{{blocked}}{{/link-to}}</td>
       </tr>
     </table>
@@ -43,11 +43,11 @@
       <thead>
         <tr>
           <th>&nbsp;</th>
-          <th>{{i18n admin.dashboard.reports.today}}</th>
-          <th>{{i18n admin.dashboard.reports.yesterday}}</th>
-          <th>{{i18n admin.dashboard.reports.last_7_days}}</th>
-          <th>{{i18n admin.dashboard.reports.last_30_days}}</th>
-          <th>{{i18n admin.dashboard.reports.all}}</th>
+          <th>{{i18n 'admin.dashboard.reports.today'}}</th>
+          <th>{{i18n 'admin.dashboard.reports.yesterday'}}</th>
+          <th>{{i18n 'admin.dashboard.reports.last_7_days'}}</th>
+          <th>{{i18n 'admin.dashboard.reports.last_30_days'}}</th>
+          <th>{{i18n 'admin.dashboard.reports.all'}}</th>
         </tr>
       </thead>
       {{#unless loading}}
@@ -67,12 +67,12 @@
     <table class="table table-condensed table-hover">
       <thead>
         <tr>
-          <th class="title" title="{{i18n admin.dashboard.private_messages_title}}"><i class="fa fa-envelope"></i> {{i18n admin.dashboard.private_messages_short}}</th>
-          <th>{{i18n admin.dashboard.reports.today}}</th>
-          <th>{{i18n admin.dashboard.reports.yesterday}}</th>
-          <th>{{i18n admin.dashboard.reports.last_7_days}}</th>
-          <th>{{i18n admin.dashboard.reports.last_30_days}}</th>
-          <th>{{i18n admin.dashboard.reports.all}}</th>
+          <th class="title" title="{{i18n 'admin.dashboard.private_messages_title'}}"><i class="fa fa-envelope"></i> {{i18n 'admin.dashboard.private_messages_short'}}</th>
+          <th>{{i18n 'admin.dashboard.reports.today'}}</th>
+          <th>{{i18n 'admin.dashboard.reports.yesterday'}}</th>
+          <th>{{i18n 'admin.dashboard.reports.last_7_days'}}</th>
+          <th>{{i18n 'admin.dashboard.reports.last_30_days'}}</th>
+          <th>{{i18n 'admin.dashboard.reports.all'}}</th>
         </tr>
       </thead>
       {{#unless loading}}
@@ -90,10 +90,10 @@
       <thead>
         <tr>
           <th>&nbsp;</th>
-          <th>{{i18n admin.dashboard.reports.today}}</th>
-          <th>{{i18n admin.dashboard.reports.yesterday}}</th>
-          <th>{{i18n admin.dashboard.reports.7_days_ago}}</th>
-          <th>{{i18n admin.dashboard.reports.30_days_ago}}</th>
+          <th>{{i18n 'admin.dashboard.reports.today'}}</th>
+          <th>{{i18n 'admin.dashboard.reports.yesterday'}}</th>
+          <th>{{i18n 'admin.dashboard.reports.7_days_ago'}}</th>
+          <th>{{i18n 'admin.dashboard.reports.30_days_ago'}}</th>
         </tr>
       </thead>
       {{#unless loading}}
@@ -110,7 +110,7 @@
       <div class="look-here"><i class="fa fa-exclamation-triangle"></i></div>
       <div class="problem-messages">
         <p {{bind-attr class="loadingProblems:invisible"}}>
-          {{i18n admin.dashboard.problems_found}}
+          {{i18n 'admin.dashboard.problems_found'}}
           <ul {{bind-attr class="loadingProblems:invisible"}}>
             {{#each problem in problems}}
               <li>{{{problem}}}</li>
@@ -118,8 +118,8 @@
           </ul>
         </p>
         <p class="actions">
-          <small>{{i18n admin.dashboard.last_checked}}: {{problemsTimestamp}}</small>
-          <button {{action "refreshProblems"}} class="btn btn-small"><i class="fa fa-refresh"></i>{{i18n admin.dashboard.refresh_problems}}</button>
+          <small>{{i18n 'admin.dashboard.last_checked'}}: {{problemsTimestamp}}</small>
+          <button {{action "refreshProblems"}} class="btn btn-small"><i class="fa fa-refresh"></i>{{i18n 'admin.dashboard.refresh_problems'}}</button>
         </p>
       </div>
       <div class="clearfix"></div>
@@ -130,8 +130,8 @@
         <div class="look-here">&nbsp;</div>
         <div class="problem-messages">
           <p>
-            {{i18n admin.dashboard.no_problems}}
-            <button {{action "refreshProblems"}} class="btn btn-small"><i class="fa fa-refresh"></i>{{i18n admin.dashboard.refresh_problems}}</button>
+            {{i18n 'admin.dashboard.no_problems'}}
+            <button {{action "refreshProblems"}} class="btn btn-small"><i class="fa fa-refresh"></i>{{i18n 'admin.dashboard.refresh_problems'}}</button>
           </p>
         </div>
         <div class="clearfix"></div>
@@ -143,7 +143,7 @@
     <table class="table table-condensed table-hover">
       <thead>
         <tr>
-          <th class="title">{{top_referred_topics.title}} ({{i18n admin.dashboard.reports.last_30_days}})</th>
+          <th class="title">{{top_referred_topics.title}} ({{i18n 'admin.dashboard.reports.last_30_days'}})</th>
           <th>{{top_referred_topics.ytitles.num_clicks}}</th>
         </tr>
       </thead>
@@ -170,7 +170,7 @@
     <table class="table table-condensed table-hover">
       <thead>
         <tr>
-          <th class="title">{{top_traffic_sources.title}} ({{i18n admin.dashboard.reports.last_30_days}})</th>
+          <th class="title">{{top_traffic_sources.title}} ({{i18n 'admin.dashboard.reports.last_30_days'}})</th>
           <th>{{top_traffic_sources.ytitles.num_clicks}}</th>
           <th>{{top_traffic_sources.ytitles.num_topics}}</th>
         </tr>
@@ -193,7 +193,7 @@
     <table class="table table-condensed table-hover">
       <thead>
         <tr>
-          <th class="title">{{top_referrers.title}} ({{i18n admin.dashboard.reports.last_30_days}})</th>
+          <th class="title">{{top_referrers.title}} ({{i18n 'admin.dashboard.reports.last_30_days'}})</th>
           <th>{{top_referrers.ytitles.num_clicks}}</th>
           <th>{{top_referrers.ytitles.num_topics}}</th>
         </tr>
@@ -215,7 +215,7 @@
 <div class='clearfix'></div>
 
 <div class="dashboard-stats pull-right">
-  <div class="pull-right">{{i18n admin.dashboard.last_updated}} {{updatedTimestamp}}</div>
+  <div class="pull-right">{{i18n 'admin.dashboard.last_updated'}} {{updatedTimestamp}}</div>
   <div class='clearfix'></div>
 </div>
 <div class='clearfix'></div>
diff --git a/app/assets/javascripts/admin/templates/email.hbs b/app/assets/javascripts/admin/templates/email.hbs
index 14ee7296f..40057afbe 100644
--- a/app/assets/javascripts/admin/templates/email.hbs
+++ b/app/assets/javascripts/admin/templates/email.hbs
@@ -1,11 +1,11 @@
 <div class='admin-controls'>
   <div class='span15'>
     <ul class="nav nav-pills">
-      <li>{{#link-to 'adminEmail.index'}}{{i18n admin.email.settings}}{{/link-to}}</li>
-      <li>{{#link-to 'adminEmail.all'}}{{i18n admin.email.all}}{{/link-to}}</li>
-      <li>{{#link-to 'adminEmail.sent'}}{{i18n admin.email.sent}}{{/link-to}}</li>
-      <li>{{#link-to 'adminEmail.skipped'}}{{i18n admin.email.skipped}}{{/link-to}}</li>
-      <li>{{#link-to 'adminEmail.previewDigest'}}{{i18n admin.email.preview_digest}}{{/link-to}}</li>
+      <li>{{#link-to 'adminEmail.index'}}{{i18n 'admin.email.settings'}}{{/link-to}}</li>
+      <li>{{#link-to 'adminEmail.all'}}{{i18n 'admin.email.all'}}{{/link-to}}</li>
+      <li>{{#link-to 'adminEmail.sent'}}{{i18n 'admin.email.sent'}}{{/link-to}}</li>
+      <li>{{#link-to 'adminEmail.skipped'}}{{i18n 'admin.email.skipped'}}{{/link-to}}</li>
+      <li>{{#link-to 'adminEmail.previewDigest'}}{{i18n 'admin.email.preview_digest'}}{{/link-to}}</li>
     </ul>
   </div>
 </div>
diff --git a/app/assets/javascripts/admin/templates/email_all.hbs b/app/assets/javascripts/admin/templates/email_all.hbs
index 702499c6b..505d152e1 100644
--- a/app/assets/javascripts/admin/templates/email_all.hbs
+++ b/app/assets/javascripts/admin/templates/email_all.hbs
@@ -1,16 +1,16 @@
 <table class='table'>
   <thead>
     <tr>
-      <th>{{i18n admin.email.time}}</th>
-      <th>{{i18n admin.email.user}}</th>
-      <th>{{i18n admin.email.to_address}}</th>
-      <th>{{i18n admin.email.email_type}}</th>
-      <th>{{i18n admin.email.skipped_reason}}</th>
+      <th>{{i18n 'admin.email.time'}}</th>
+      <th>{{i18n 'admin.email.user'}}</th>
+      <th>{{i18n 'admin.email.to_address'}}</th>
+      <th>{{i18n 'admin.email.email_type'}}</th>
+      <th>{{i18n 'admin.email.skipped_reason'}}</th>
     </tr>
   </thead>
 
   <tr class="filters">
-    <td>{{i18n admin.email.logs.filters.title}}</td>
+    <td>{{i18n 'admin.email.logs.filters.title'}}</td>
     <td>{{text-field value=filter.user placeholderKey="admin.email.logs.filters.user_placeholder"}}</td>
     <td>{{text-field value=filter.address placeholderKey="admin.email.logs.filters.address_placeholder"}}</td>
     <td>{{text-field value=filter.type placeholderKey="admin.email.logs.filters.type_placeholder"}}</td>
@@ -33,7 +33,7 @@
       <td>{{skipped_reason}}</td>
     </tr>
   {{else}}
-    <tr><td colspan="5">{{i18n admin.email.logs.none}}</td></tr>
+    <tr><td colspan="5">{{i18n 'admin.email.logs.none'}}</td></tr>
   {{/each}}
 
 </table>
diff --git a/app/assets/javascripts/admin/templates/email_index.hbs b/app/assets/javascripts/admin/templates/email_index.hbs
index 461435534..89efb036a 100644
--- a/app/assets/javascripts/admin/templates/email_index.hbs
+++ b/app/assets/javascripts/admin/templates/email_index.hbs
@@ -1,6 +1,6 @@
 <table class="table">
   <tr>
-    <th>{{i18n admin.email.delivery_method}}</th>
+    <th>{{i18n 'admin.email.delivery_method'}}</th>
     <td>{{model.delivery_method}}</td>
   </tr>
 
@@ -14,14 +14,14 @@
 
 <div class='admin-controls'>
   {{#if sendingEmail}}
-  <div class='span15 controls'>{{i18n admin.email.sending_test}}</div>
+  <div class='span15 controls'>{{i18n 'admin.email.sending_test'}}</div>
   {{else}}
   <div class='controls'>
     {{text-field value=testEmailAddress placeholderKey="admin.email.test_email_address"}}
   </div>
   <div class='span10 controls'>
-    <button class='btn btn-primary' {{action "sendTestEmail"}} {{bind-attr disabled="sendTestEmailDisabled"}}>{{i18n admin.email.send_test}}</button>
-    {{#if sentTestEmail}}<span class='result-message'>{{i18n admin.email.sent_test}}</span>{{/if}}
+    <button class='btn btn-primary' {{action "sendTestEmail"}} {{bind-attr disabled="sendTestEmailDisabled"}}>{{i18n 'admin.email.send_test'}}</button>
+    {{#if sentTestEmail}}<span class='result-message'>{{i18n 'admin.email.sent_test'}}</span>{{/if}}
   </div>
   {{/if}}
 </div>
diff --git a/app/assets/javascripts/admin/templates/email_preview_digest.hbs b/app/assets/javascripts/admin/templates/email_preview_digest.hbs
index b9119e5ea..d5f3f932b 100644
--- a/app/assets/javascripts/admin/templates/email_preview_digest.hbs
+++ b/app/assets/javascripts/admin/templates/email_preview_digest.hbs
@@ -1,19 +1,19 @@
-<p>{{i18n admin.email.preview_digest_desc}}</p>
+<p>{{i18n 'admin.email.preview_digest_desc'}}</p>
 
 <div class='admin-controls'>
   <div class='span7 controls'>
-    <label for='last-seen'>{{i18n admin.email.last_seen_user}}</label>
+    <label for='last-seen'>{{i18n 'admin.email.last_seen_user'}}</label>
     {{input type="date" value=lastSeen id="last-seen"}}
   </div>
   <div>
-    <button class='btn' {{action "refresh"}}>{{i18n admin.email.refresh}}</button>
+    <button class='btn' {{action "refresh"}}>{{i18n 'admin.email.refresh'}}</button>
   </div>
   <div class="span7 toggle">
-    <label>{{i18n admin.email.format}}</label>
+    <label>{{i18n 'admin.email.format'}}</label>
     {{#if showHtml}}
-      <span>{{i18n admin.email.html}}</span> | <a href='#' {{action "toggleShowHtml"}}>{{i18n admin.email.text}}</a>
+      <span>{{i18n 'admin.email.html'}}</span> | <a href='#' {{action "toggleShowHtml"}}>{{i18n 'admin.email.text'}}</a>
     {{else}}
-      <a href='#' {{action "toggleShowHtml"}}>{{i18n admin.email.html}}</a> | <span>{{i18n admin.email.text}}</span>
+      <a href='#' {{action "toggleShowHtml"}}>{{i18n 'admin.email.html'}}</a> | <span>{{i18n 'admin.email.text'}}</span>
     {{/if}}
   </div>
 </div>
diff --git a/app/assets/javascripts/admin/templates/email_sent.hbs b/app/assets/javascripts/admin/templates/email_sent.hbs
index f3c2cc436..6c61a7799 100644
--- a/app/assets/javascripts/admin/templates/email_sent.hbs
+++ b/app/assets/javascripts/admin/templates/email_sent.hbs
@@ -1,16 +1,16 @@
 <table class='table'>
   <thead>
     <tr>
-      <th>{{i18n admin.email.sent_at}}</th>
-      <th>{{i18n admin.email.user}}</th>
-      <th>{{i18n admin.email.to_address}}</th>
-      <th>{{i18n admin.email.email_type}}</th>
-      <th>{{i18n admin.email.reply_key}}</th>
+      <th>{{i18n 'admin.email.sent_at'}}</th>
+      <th>{{i18n 'admin.email.user'}}</th>
+      <th>{{i18n 'admin.email.to_address'}}</th>
+      <th>{{i18n 'admin.email.email_type'}}</th>
+      <th>{{i18n 'admin.email.reply_key'}}</th>
     </tr>
   </thead>
 
   <tr class="filters">
-    <td>{{i18n admin.email.logs.filters.title}}</td>
+    <td>{{i18n 'admin.email.logs.filters.title'}}</td>
     <td>{{text-field value=filter.user placeholderKey="admin.email.logs.filters.user_placeholder"}}</td>
     <td>{{text-field value=filter.address placeholderKey="admin.email.logs.filters.address_placeholder"}}</td>
     <td>{{text-field value=filter.type placeholderKey="admin.email.logs.filters.type_placeholder"}}</td>
@@ -33,7 +33,7 @@
       <td>{{reply_key}}</td>
     </tr>
   {{else}}
-    <tr><td colspan="5">{{i18n admin.email.logs.none}}</td></tr>
+    <tr><td colspan="5">{{i18n 'admin.email.logs.none'}}</td></tr>
   {{/each}}
 
 </table>
diff --git a/app/assets/javascripts/admin/templates/email_skipped.hbs b/app/assets/javascripts/admin/templates/email_skipped.hbs
index 702499c6b..505d152e1 100644
--- a/app/assets/javascripts/admin/templates/email_skipped.hbs
+++ b/app/assets/javascripts/admin/templates/email_skipped.hbs
@@ -1,16 +1,16 @@
 <table class='table'>
   <thead>
     <tr>
-      <th>{{i18n admin.email.time}}</th>
-      <th>{{i18n admin.email.user}}</th>
-      <th>{{i18n admin.email.to_address}}</th>
-      <th>{{i18n admin.email.email_type}}</th>
-      <th>{{i18n admin.email.skipped_reason}}</th>
+      <th>{{i18n 'admin.email.time'}}</th>
+      <th>{{i18n 'admin.email.user'}}</th>
+      <th>{{i18n 'admin.email.to_address'}}</th>
+      <th>{{i18n 'admin.email.email_type'}}</th>
+      <th>{{i18n 'admin.email.skipped_reason'}}</th>
     </tr>
   </thead>
 
   <tr class="filters">
-    <td>{{i18n admin.email.logs.filters.title}}</td>
+    <td>{{i18n 'admin.email.logs.filters.title'}}</td>
     <td>{{text-field value=filter.user placeholderKey="admin.email.logs.filters.user_placeholder"}}</td>
     <td>{{text-field value=filter.address placeholderKey="admin.email.logs.filters.address_placeholder"}}</td>
     <td>{{text-field value=filter.type placeholderKey="admin.email.logs.filters.type_placeholder"}}</td>
@@ -33,7 +33,7 @@
       <td>{{skipped_reason}}</td>
     </tr>
   {{else}}
-    <tr><td colspan="5">{{i18n admin.email.logs.none}}</td></tr>
+    <tr><td colspan="5">{{i18n 'admin.email.logs.none'}}</td></tr>
   {{/each}}
 
 </table>
diff --git a/app/assets/javascripts/admin/templates/flags-list.hbs b/app/assets/javascripts/admin/templates/flags-list.hbs
index 3afa757d0..e6079d565 100644
--- a/app/assets/javascripts/admin/templates/flags-list.hbs
+++ b/app/assets/javascripts/admin/templates/flags-list.hbs
@@ -4,8 +4,8 @@
       <tr>
         <th class='user'></th>
         <th class='excerpt'></th>
-        <th class='flaggers'>{{i18n admin.flags.flagged_by}}</th>
-        <th class='flaggers'>{{#if adminOldFlagsView}}{{i18n admin.flags.resolved_by}}{{/if}}</th>
+        <th class='flaggers'>{{i18n 'admin.flags.flagged_by'}}</th>
+        <th class='flaggers'>{{#if adminOldFlagsView}}{{i18n 'admin.flags.resolved_by'}}{{/if}}</th>
       </tr>
     </thead>
     <tbody>
@@ -16,12 +16,12 @@
             {{#if flaggedPost.postAuthorFlagged}}
               {{#if flaggedPost.user}}
                 {{#link-to 'adminUser' flaggedPost.user}}{{avatar flaggedPost.user imageSize="small"}}{{/link-to}}
-                {{#if flaggedPost.wasEdited}}<i class="fa fa-pencil" title="{{i18n admin.flags.was_edited}}"></i>{{/if}}
+                {{#if flaggedPost.wasEdited}}<i class="fa fa-pencil" title="{{i18n 'admin.flags.was_edited'}}"></i>{{/if}}
               {{/if}}
             {{/if}}
             {{#if adminActiveFlagsView}}
               {{#if flaggedPost.previous_flags_count}}
-                <span title="{{i18n admin.flags.previous_flags_count count=flaggedPost.previous_flags_count}}" class="badge-notification flagged-posts">{{flaggedPost.previous_flags_count}}</span>
+                <span title="{{i18n 'admin.flags.previous_flags_count' count=flaggedPost.previous_flags_count}}" class="badge-notification flagged-posts">{{flaggedPost.previous_flags_count}}</span>
               {{/if}}
             {{/if}}
           </td>
@@ -78,7 +78,7 @@
                         {{format-age disposedAt}}
                         {{{dispositionIcon}}}
                         {{#if tookAction}}
-                          <i class='fa fa-gavel' title='{{i18n admin.flags.took_action}}'></i>
+                          <i class='fa fa-gavel' title='{{i18n 'admin.flags.took_action'}}'></i>
                         {{/if}}
                       </td>
                     </tr>
@@ -95,7 +95,7 @@
             <td></td>
             <td colspan="3">
               <div>
-                {{{i18n admin.flags.topic_flagged}}}&nbsp;<a href='{{unbound flaggedPost.url}}' class="btn">{{i18n admin.flags.visit_topic}}</a>
+                {{{i18n 'admin.flags.topic_flagged'}}}&nbsp;<a href='{{unbound flaggedPost.url}}' class="btn">{{i18n 'admin.flags.visit_topic'}}</a>
               </div>
             </td>
           </tr>
@@ -114,12 +114,12 @@
                     <p>
                       {{#link-to 'adminUser' reply.user}}{{avatar reply.user imageSize="small"}}{{/link-to}}&nbsp;{{{reply.excerpt}}}
                       {{#if hasMore}}
-                        <a href="{{unbound permalink}}">{{i18n admin.flags.more}}</a>
+                        <a href="{{unbound permalink}}">{{i18n 'admin.flags.more'}}</a>
                       {{/if}}
                     </p>
                   {{/if}}
                   <a href="{{unbound permalink}}">
-                    <button class='btn btn-reply'><i class="fa fa-reply"></i>&nbsp;{{i18n admin.flags.reply_message}}</button>
+                    <button class='btn btn-reply'><i class="fa fa-reply"></i>&nbsp;{{i18n 'admin.flags.reply_message'}}</button>
                   </a>
                 {{/if}}
               </div>
@@ -130,14 +130,14 @@
         <tr>
           <td colspan="4" class="action">
             {{#if adminActiveFlagsView}}
-              <button title='{{i18n admin.flags.agree_title}}' class='btn' {{action "showAgreeFlagModal" flaggedPost}}><i class="fa fa-thumbs-o-up"></i>{{i18n admin.flags.agree}}&hellip;</button>
+              <button title='{{i18n 'admin.flags.agree_title'}}' class='btn' {{action "showAgreeFlagModal" flaggedPost}}><i class="fa fa-thumbs-o-up"></i>{{i18n 'admin.flags.agree'}}&hellip;</button>
               {{#if flaggedPost.postHidden}}
-                <button title='{{i18n admin.flags.disagree_flag_unhide_post_title}}' class='btn' {{action "disagreeFlags" flaggedPost}}><i class="fa fa-thumbs-o-down"></i>{{i18n admin.flags.disagree_flag_unhide_post}}</button>
+                <button title='{{i18n 'admin.flags.disagree_flag_unhide_post_title'}}' class='btn' {{action "disagreeFlags" flaggedPost}}><i class="fa fa-thumbs-o-down"></i>{{i18n 'admin.flags.disagree_flag_unhide_post'}}</button>
               {{else}}
-                <button title='{{i18n admin.flags.disagree_flag_title}}' class='btn' {{action "disagreeFlags" flaggedPost}}><i class="fa fa-thumbs-o-down"></i>{{i18n admin.flags.disagree_flag}}</button>
+                <button title='{{i18n 'admin.flags.disagree_flag_title'}}' class='btn' {{action "disagreeFlags" flaggedPost}}><i class="fa fa-thumbs-o-down"></i>{{i18n 'admin.flags.disagree_flag'}}</button>
               {{/if}}
-              <button title='{{i18n admin.flags.defer_flag_title}}' class='btn' {{action "deferFlags" flaggedPost}}><i class="fa fa-external-link"></i>{{i18n admin.flags.defer_flag}}</button>
-              <button title='{{i18n admin.flags.delete_title}}' class='btn btn-danger' {{action "showDeleteFlagModal" flaggedPost}}><i class="fa fa-trash-o"></i>{{i18n admin.flags.delete}}&hellip;</button>
+              <button title='{{i18n 'admin.flags.defer_flag_title'}}' class='btn' {{action "deferFlags" flaggedPost}}><i class="fa fa-external-link"></i>{{i18n 'admin.flags.defer_flag'}}</button>
+              <button title='{{i18n 'admin.flags.delete_title'}}' class='btn btn-danger' {{action "showDeleteFlagModal" flaggedPost}}><i class="fa fa-trash-o"></i>{{i18n 'admin.flags.delete'}}&hellip;</button>
             {{/if}}
           </td>
         </tr>
@@ -149,5 +149,5 @@
 
   {{loading-spinner condition=view.loading}}
 {{else}}
-  <p>{{i18n admin.flags.no_results}}</p>
+  <p>{{i18n 'admin.flags.no_results'}}</p>
 {{/if}}
diff --git a/app/assets/javascripts/admin/templates/flags.hbs b/app/assets/javascripts/admin/templates/flags.hbs
index 78e11492b..e99f63cfa 100644
--- a/app/assets/javascripts/admin/templates/flags.hbs
+++ b/app/assets/javascripts/admin/templates/flags.hbs
@@ -1,8 +1,8 @@
 <div class='admin-controls'>
   <div class='span15'>
     <ul class="nav nav-pills">
-      <li>{{#link-to 'adminFlags.list' 'active'}}{{i18n admin.flags.active}}{{/link-to}}</li>
-      <li>{{#link-to 'adminFlags.list' 'old'}}{{i18n admin.flags.old}}{{/link-to}}</li>
+      <li>{{#link-to 'adminFlags.list' 'active'}}{{i18n 'admin.flags.active'}}{{/link-to}}</li>
+      <li>{{#link-to 'adminFlags.list' 'old'}}{{i18n 'admin.flags.old'}}{{/link-to}}</li>
     </ul>
   </div>
 </div>
diff --git a/app/assets/javascripts/admin/templates/group.hbs b/app/assets/javascripts/admin/templates/group.hbs
index 396e39b88..e37eb39a7 100644
--- a/app/assets/javascripts/admin/templates/group.hbs
+++ b/app/assets/javascripts/admin/templates/group.hbs
@@ -5,25 +5,25 @@
 {{/if}}
 
 <div class="control-group">
-  <label class="control-label">{{i18n admin.groups.group_members}}</label>
+  <label class="control-label">{{i18n 'admin.groups.group_members'}}</label>
   <div class="controls">
     {{user-selector usernames=usernames id="group-users" placeholderKey="admin.groups.selector_placeholder" tabindex="1" disabled=automatic}}
   </div>
 </div>
 <div class="control-group">
   <div class="controls">
-    {{input type="checkbox" checked=visible}} {{i18n groups.visible}}
+    {{input type="checkbox" checked=visible}} {{i18n 'groups.visible'}}
   </div>
 </div>
 <div class="control-group">
-  <label class="control-label">{{i18n groups.alias_levels.title}}</label>
+  <label class="control-label">{{i18n 'groups.alias_levels.title'}}</label>
   <div class="controls">
     {{combo-box valueAttribute="value" value=alias_level content=aliasLevelOptions}}
   </div>
 </div>
 <div class='controls'>
-  <button {{action "save"}} {{bind-attr disabled="disableSave"}} class='btn'>{{i18n admin.customize.save}}</button>
+  <button {{action "save"}} {{bind-attr disabled="disableSave"}} class='btn'>{{i18n 'admin.customize.save'}}</button>
   {{#unless automatic}}
-    <button {{action "destroy"}} class='btn btn-danger'><i class="fa fa-trash-o"></i>{{i18n admin.customize.delete}}</button>
+    <button {{action "destroy"}} class='btn btn-danger'><i class="fa fa-trash-o"></i>{{i18n 'admin.customize.delete'}}</button>
   {{/unless}}
 </div>
diff --git a/app/assets/javascripts/admin/templates/groups.hbs b/app/assets/javascripts/admin/templates/groups.hbs
index aac3928e6..061bf715d 100644
--- a/app/assets/javascripts/admin/templates/groups.hbs
+++ b/app/assets/javascripts/admin/templates/groups.hbs
@@ -1,6 +1,6 @@
 <div class='row groups'>
   <div class='content-list span6'>
-    <h3>{{i18n admin.groups.edit}}</h3>
+    <h3>{{i18n 'admin.groups.edit'}}</h3>
     <ul>
       {{#each group in arrangedContent}}
         <li>
@@ -9,8 +9,8 @@
       {{/each}}
     </ul>
     <div class='controls'>
-      <button class='btn' {{bind-attr disabled="refreshingAutoGroups"}} {{action "refreshAutoGroups"}}><i class="fa fa-refresh"></i>{{i18n admin.groups.refresh}}</button>
-      <button class='btn' {{action "newGroup"}}><i class="fa fa-plus"></i>{{i18n admin.groups.new}}</button>
+      <button class='btn' {{bind-attr disabled="refreshingAutoGroups"}} {{action "refreshAutoGroups"}}><i class="fa fa-refresh"></i>{{i18n 'admin.groups.refresh'}}</button>
+      <button class='btn' {{action "newGroup"}}><i class="fa fa-plus"></i>{{i18n 'admin.groups.new'}}</button>
     </div>
   </div>
 
diff --git a/app/assets/javascripts/admin/templates/groups_index.hbs b/app/assets/javascripts/admin/templates/groups_index.hbs
index 5c29aa24a..f8a3f440e 100644
--- a/app/assets/javascripts/admin/templates/groups_index.hbs
+++ b/app/assets/javascripts/admin/templates/groups_index.hbs
@@ -1 +1 @@
-{{i18n admin.groups.about}}
+{{i18n 'admin.groups.about'}}
diff --git a/app/assets/javascripts/admin/templates/logs.hbs b/app/assets/javascripts/admin/templates/logs.hbs
index 483381353..0e4f8b4a6 100644
--- a/app/assets/javascripts/admin/templates/logs.hbs
+++ b/app/assets/javascripts/admin/templates/logs.hbs
@@ -1,15 +1,15 @@
 <div class='admin-controls'>
   <div class='span15'>
     <ul class="nav nav-pills">
-      <li>{{#link-to 'adminLogs.staffActionLogs'}}{{i18n admin.logs.staff_actions.title}}{{/link-to}}</li>
-      <li>{{#link-to 'adminLogs.screenedEmails'}}{{i18n admin.logs.screened_emails.title}}{{/link-to}}</li>
-      <li>{{#link-to 'adminLogs.screenedIpAddresses'}}{{i18n admin.logs.screened_ips.title}}{{/link-to}}</li>
-      <li>{{#link-to 'adminLogs.screenedUrls'}}{{i18n admin.logs.screened_urls.title}}{{/link-to}}</li>
-      <li><a href="/logs" data-auto-route="true">{{i18n admin.logs.logster.title}}</a></li>
+      <li>{{#link-to 'adminLogs.staffActionLogs'}}{{i18n 'admin.logs.staff_actions.title'}}{{/link-to}}</li>
+      <li>{{#link-to 'adminLogs.screenedEmails'}}{{i18n 'admin.logs.screened_emails.title'}}{{/link-to}}</li>
+      <li>{{#link-to 'adminLogs.screenedIpAddresses'}}{{i18n 'admin.logs.screened_ips.title'}}{{/link-to}}</li>
+      <li>{{#link-to 'adminLogs.screenedUrls'}}{{i18n 'admin.logs.screened_urls.title'}}{{/link-to}}</li>
+      <li><a href="/logs" data-auto-route="true">{{i18n 'admin.logs.logster.title'}}</a></li>
     </ul>
   </div>
   <div class="pull-right">
-    <button {{action "exportScreenedIps"}} class="btn" title="{{i18n admin.export_csv.screened_ips.title}}">{{fa-icon "download"}}{{i18n admin.export_csv.button_text}}</button>
+    <button {{action "exportScreenedIps"}} class="btn" title="{{i18n 'admin.export_csv.screened_ips.title'}}">{{fa-icon "download"}}{{i18n 'admin.export_csv.button_text'}}</button>
   </div>
 </div>
 
diff --git a/app/assets/javascripts/admin/templates/logs/_site_customization_change_details.hbs b/app/assets/javascripts/admin/templates/logs/_site_customization_change_details.hbs
index f3f5acf19..eced3892f 100644
--- a/app/assets/javascripts/admin/templates/logs/_site_customization_change_details.hbs
+++ b/app/assets/javascripts/admin/templates/logs/_site_customization_change_details.hbs
@@ -1,22 +1,22 @@
 <section class="field">
-  <b>{{i18n admin.customize.css}}</b>:
+  <b>{{i18n 'admin.customize.css'}}</b>:
   {{#if stylesheet}}
-    ({{i18n character_count count=stylesheet.length}})
+    ({{i18n 'character_count' count=stylesheet.length}})
   {{/if}}
   <br/>
   {{textarea value=stylesheet class="plain"}}
 </section>
 <section class="field">
-  <b>{{i18n admin.customize.header}}</b>:
+  <b>{{i18n 'admin.customize.header'}}</b>:
   {{#if header}}
-    ({{i18n character_count count=header.length}})
+    ({{i18n 'character_count' count=header.length}})
   {{/if}}
   <br/>
   {{textarea value=header class="plain"}}
 </section>
 <section class="field">
-  <b>{{i18n admin.customize.enabled}}</b>: {{enabled}}
+  <b>{{i18n 'admin.customize.enabled'}}</b>: {{enabled}}
 </section>
 <section class="field">
-  <b>{{i18n admin.customize.override_default}}</b>: {{override_default_style}}
+  <b>{{i18n 'admin.customize.override_default'}}</b>: {{override_default_style}}
 </section>
diff --git a/app/assets/javascripts/admin/templates/logs/details_modal.hbs b/app/assets/javascripts/admin/templates/logs/details_modal.hbs
index 232e99373..d789dd9cc 100644
--- a/app/assets/javascripts/admin/templates/logs/details_modal.hbs
+++ b/app/assets/javascripts/admin/templates/logs/details_modal.hbs
@@ -2,5 +2,5 @@
   <pre>{{details}}</pre>
 </div>
 <div class="modal-footer">
-  <button class='btn btn-primary' {{action "closeModal"}}>{{i18n close}}</button>
+  <button class='btn btn-primary' {{action "closeModal"}}>{{i18n 'close'}}</button>
 </div>
diff --git a/app/assets/javascripts/admin/templates/logs/screened_emails.hbs b/app/assets/javascripts/admin/templates/logs/screened_emails.hbs
index d61eb4457..3a426459a 100644
--- a/app/assets/javascripts/admin/templates/logs/screened_emails.hbs
+++ b/app/assets/javascripts/admin/templates/logs/screened_emails.hbs
@@ -1,16 +1,16 @@
-<p>{{i18n admin.logs.screened_emails.description}}</p>
+<p>{{i18n 'admin.logs.screened_emails.description'}}</p>
 
 {{#loading-spinner condition=loading}}
   {{#if model.length}}
 
     <div class='table screened-emails'>
       <div class="heading-container">
-        <div class="col heading first email">{{i18n admin.logs.screened_emails.email}}</div>
-        <div class="col heading action">{{i18n admin.logs.action}}</div>
-        <div class="col heading match_count">{{i18n admin.logs.match_count}}</div>
-        <div class="col heading last_match_at">{{i18n admin.logs.last_match_at}}</div>
-        <div class="col heading created_at">{{i18n admin.logs.created_at}}</div>
-        <div class="col heading ip_address">{{i18n admin.logs.ip_address}}</div>
+        <div class="col heading first email">{{i18n 'admin.logs.screened_emails.email'}}</div>
+        <div class="col heading action">{{i18n 'admin.logs.action'}}</div>
+        <div class="col heading match_count">{{i18n 'admin.logs.match_count'}}</div>
+        <div class="col heading last_match_at">{{i18n 'admin.logs.last_match_at'}}</div>
+        <div class="col heading created_at">{{i18n 'admin.logs.created_at'}}</div>
+        <div class="col heading ip_address">{{i18n 'admin.logs.ip_address'}}</div>
         <div class="col heading action"></div>
         <div class="clearfix"></div>
       </div>
@@ -19,6 +19,6 @@
     </div>
 
   {{else}}
-    {{i18n search.no_results}}
+    {{i18n 'search.no_results'}}
   {{/if}}
 {{/loading-spinner}}
diff --git a/app/assets/javascripts/admin/templates/logs/screened_emails_list_item.hbs b/app/assets/javascripts/admin/templates/logs/screened_emails_list_item.hbs
index 9cbd963f8..7522d0af6 100644
--- a/app/assets/javascripts/admin/templates/logs/screened_emails_list_item.hbs
+++ b/app/assets/javascripts/admin/templates/logs/screened_emails_list_item.hbs
@@ -6,5 +6,5 @@
 <div class="col last_match_at">{{age-with-tooltip last_match_at}}</div>
 <div class="col created_at">{{age-with-tooltip created_at}}</div>
 <div class="col ip_address">{{ip_address}}</div>
-<div class="col action"><button class="btn" {{action "clearBlock" this}}><i class='fa fa-check'></i> {{i18n admin.logs.screened_emails.actions.allow}}</button></div>
+<div class="col action"><button class="btn" {{action "clearBlock" this}}><i class='fa fa-check'></i> {{i18n 'admin.logs.screened_emails.actions.allow'}}</button></div>
 <div class="clearfix"></div>
diff --git a/app/assets/javascripts/admin/templates/logs/screened_ip_addresses.hbs b/app/assets/javascripts/admin/templates/logs/screened_ip_addresses.hbs
index 4a4350faf..f26fc2b0c 100644
--- a/app/assets/javascripts/admin/templates/logs/screened_ip_addresses.hbs
+++ b/app/assets/javascripts/admin/templates/logs/screened_ip_addresses.hbs
@@ -1,5 +1,5 @@
-<p>{{i18n admin.logs.screened_ips.description}}</p>
-<button class="btn pull-right" {{action "rollUp"}} title="{{i18n admin.logs.screened_ips.roll_up.title}}">{{i18n admin.logs.screened_ips.roll_up.text}}</button>
+<p>{{i18n 'admin.logs.screened_ips.description'}}</p>
+<button class="btn pull-right" {{action "rollUp"}} title="{{i18n 'admin.logs.screened_ips.roll_up.title'}}">{{i18n 'admin.logs.screened_ips.roll_up.text'}}</button>
 {{screened-ip-address-form action="recordAdded"}}
 <br/>
 
@@ -8,11 +8,11 @@
 
     <div class='table admin-logs-table screened-ip-addresses'>
       <div class="heading-container">
-        <div class="col heading first ip_address">{{i18n admin.logs.ip_address}}</div>
-        <div class="col heading action">{{i18n admin.logs.action}}</div>
-        <div class="col heading match_count">{{i18n admin.logs.match_count}}</div>
-        <div class="col heading last_match_at">{{i18n admin.logs.last_match_at}}</div>
-        <div class="col heading created_at">{{i18n admin.logs.created_at}}</div>
+        <div class="col heading first ip_address">{{i18n 'admin.logs.ip_address'}}</div>
+        <div class="col heading action">{{i18n 'admin.logs.action'}}</div>
+        <div class="col heading match_count">{{i18n 'admin.logs.match_count'}}</div>
+        <div class="col heading last_match_at">{{i18n 'admin.logs.last_match_at'}}</div>
+        <div class="col heading created_at">{{i18n 'admin.logs.created_at'}}</div>
         <div class="col heading actions"></div>
         <div class="clearfix"></div>
       </div>
@@ -21,6 +21,6 @@
     </div>
 
   {{else}}
-    {{i18n search.no_results}}
+    {{i18n 'search.no_results'}}
   {{/if}}
 {{/loading-spinner}}
diff --git a/app/assets/javascripts/admin/templates/logs/screened_ip_addresses_list_item.hbs b/app/assets/javascripts/admin/templates/logs/screened_ip_addresses_list_item.hbs
index ed9e7fe8b..94bc4155e 100644
--- a/app/assets/javascripts/admin/templates/logs/screened_ip_addresses_list_item.hbs
+++ b/app/assets/javascripts/admin/templates/logs/screened_ip_addresses_list_item.hbs
@@ -27,13 +27,13 @@
     <button class="btn btn-danger" {{action "destroy" this}}><i class="fa fa-trash-o"></i></button>
     <button class="btn" {{action "edit" this}}><i class="fa fa-pencil"></i></button>
     {{#if isBlocked}}
-      <button class="btn" {{action "allow" this}}><i {{bind-attr class=":fa doNothingIcon"}}></i> {{i18n admin.logs.screened_ips.actions.do_nothing}}</button>
+      <button class="btn" {{action "allow" this}}><i {{bind-attr class=":fa doNothingIcon"}}></i> {{i18n 'admin.logs.screened_ips.actions.do_nothing'}}</button>
     {{else}}
-      <button class="btn" {{action "block" this}}><i {{bind-attr class=":fa blockIcon"}}></i> {{i18n admin.logs.screened_ips.actions.block}}</button>
+      <button class="btn" {{action "block" this}}><i {{bind-attr class=":fa blockIcon"}}></i> {{i18n 'admin.logs.screened_ips.actions.block'}}</button>
     {{/if}}
   {{else}}
-    <button class="btn" {{action "save" this}}>{{i18n admin.logs.save}}</button>
-    <a {{action "cancel" this}}>{{i18n cancel}}</a>
+    <button class="btn" {{action "save" this}}>{{i18n 'admin.logs.save'}}</button>
+    <a {{action "cancel" this}}>{{i18n 'cancel'}}</a>
   {{/unless}}
 </div>
 <div class="clearfix"></div>
diff --git a/app/assets/javascripts/admin/templates/logs/screened_urls.hbs b/app/assets/javascripts/admin/templates/logs/screened_urls.hbs
index 4a87eaf9c..ded1bba24 100644
--- a/app/assets/javascripts/admin/templates/logs/screened_urls.hbs
+++ b/app/assets/javascripts/admin/templates/logs/screened_urls.hbs
@@ -1,20 +1,20 @@
-<p>{{i18n admin.logs.screened_urls.description}}</p>
+<p>{{i18n 'admin.logs.screened_urls.description'}}</p>
 
 {{#loading-spinner condition=loading}}
   {{#if model.length}}
     <div class='table screened-urls'>
       <div class="heading-container">
-        <div class="col heading first domain">{{i18n admin.logs.screened_urls.domain}}</div>
-        <div class="col heading action">{{i18n admin.logs.action}}</div>
-        <div class="col heading match_count">{{i18n admin.logs.match_count}}</div>
-        <div class="col heading last_match_at">{{i18n admin.logs.last_match_at}}</div>
-        <div class="col heading created_at">{{i18n admin.logs.created_at}}</div>
+        <div class="col heading first domain">{{i18n 'admin.logs.screened_urls.domain'}}</div>
+        <div class="col heading action">{{i18n 'admin.logs.action'}}</div>
+        <div class="col heading match_count">{{i18n 'admin.logs.match_count'}}</div>
+        <div class="col heading last_match_at">{{i18n 'admin.logs.last_match_at'}}</div>
+        <div class="col heading created_at">{{i18n 'admin.logs.created_at'}}</div>
         <div class="clearfix"></div>
       </div>
 
       {{view 'screened-urls-list' content=controller}}
     </div>
   {{else}}
-    {{i18n search.no_results}}
+    {{i18n 'search.no_results'}}
   {{/if}}
 {{/loading-spinner}}
diff --git a/app/assets/javascripts/admin/templates/logs/site_customization_change_modal.hbs b/app/assets/javascripts/admin/templates/logs/site_customization_change_modal.hbs
index 301ebd9d5..7fb1a8d25 100644
--- a/app/assets/javascripts/admin/templates/logs/site_customization_change_modal.hbs
+++ b/app/assets/javascripts/admin/templates/logs/site_customization_change_modal.hbs
@@ -1,10 +1,10 @@
 <div>
   <ul class="nav nav-pills">
     <li {{bind-attr class="newSelected:active"}}>
-      <a href="#" {{action "selectNew"}}>{{i18n admin.logs.staff_actions.new_value}}</a>
+      <a href="#" {{action "selectNew"}}>{{i18n 'admin.logs.staff_actions.new_value'}}</a>
     </li>
     <li {{bind-attr class="previousSelected:active"}}>
-      <a href="#" {{action "selectPrevious"}}>{{i18n admin.logs.staff_actions.previous_value}}</a>
+      <a href="#" {{action "selectPrevious"}}>{{i18n 'admin.logs.staff_actions.previous_value'}}</a>
     </li>
   </ul>
   <div class="modal-body">
@@ -14,7 +14,7 @@
           {{partial "admin/templates/logs/site_customization_change_details"}}
         {{/with}}
       {{else}}
-        {{i18n admin.logs.staff_actions.deleted}}
+        {{i18n 'admin.logs.staff_actions.deleted'}}
       {{/if}}
     </div>
     <div {{bind-attr class=":modal-tab :previous-tab previousSelected::invisible"}}>
@@ -23,11 +23,11 @@
           {{partial "admin/templates/logs/site_customization_change_details"}}
         {{/with}}
       {{else}}
-        {{i18n admin.logs.staff_actions.no_previous}}
+        {{i18n 'admin.logs.staff_actions.no_previous'}}
       {{/if}}
     </div>
   </div>
   <div class="modal-footer">
-    <button class='btn btn-primary' {{action "closeModal"}}>{{i18n close}}</button>
+    <button class='btn btn-primary' {{action "closeModal"}}>{{i18n 'close'}}</button>
   </div>
 </div>
diff --git a/app/assets/javascripts/admin/templates/logs/staff_action_logs.hbs b/app/assets/javascripts/admin/templates/logs/staff_action_logs.hbs
index c12978703..66fa817fd 100644
--- a/app/assets/javascripts/admin/templates/logs/staff_action_logs.hbs
+++ b/app/assets/javascripts/admin/templates/logs/staff_action_logs.hbs
@@ -1,45 +1,45 @@
 <div class="staff-action-logs-controls">
   <a {{action "clearAllFilters"}} {{bind-attr class=":clear-filters :filter filtersExists::invisible"}}>
-    <span class="label">{{i18n admin.logs.staff_actions.clear_filters}}</span>
+    <span class="label">{{i18n 'admin.logs.staff_actions.clear_filters'}}</span>
   </a>
   {{#if actionFilter}}
     <a {{action "clearFilter" "action_name"}} class="filter">
-      <span class="label">{{i18n admin.logs.action}}</span>: {{actionFilter}}
+      <span class="label">{{i18n 'admin.logs.action'}}</span>: {{actionFilter}}
       <i class="fa fa-times-circle"></i>
     </a>
   {{/if}}
   {{#if filters.acting_user}}
     <a {{action "clearFilter" "acting_user"}} class="filter">
-      <span class="label">{{i18n admin.logs.staff_actions.staff_user}}</span>: {{filters.acting_user}}
+      <span class="label">{{i18n 'admin.logs.staff_actions.staff_user'}}</span>: {{filters.acting_user}}
       <i class="fa fa-times-circle"></i>
     </a>
   {{/if}}
   {{#if filters.target_user}}
     <a {{action "clearFilter" "target_user"}} class="filter">
-      <span class="label">{{i18n admin.logs.staff_actions.target_user}}</span>: {{filters.target_user}}
+      <span class="label">{{i18n 'admin.logs.staff_actions.target_user'}}</span>: {{filters.target_user}}
       <i class="fa fa-times-circle"></i>
     </a>
   {{/if}}
   {{#if filters.subject}}
     <a {{action "clearFilter" "subject"}} class="filter">
-      <span class="label">{{i18n admin.logs.staff_actions.subject}}</span>: {{filters.subject}}
+      <span class="label">{{i18n 'admin.logs.staff_actions.subject'}}</span>: {{filters.subject}}
       <i class="fa fa-times-circle"></i>
     </a>
   {{/if}}
 </div>
 
 <div class="staff-action-logs-instructions" {{bind-attr class=":staff-action-logs-instructions showInstructions::invisible"}}>
-  {{i18n admin.logs.staff_actions.instructions}}
+  {{i18n 'admin.logs.staff_actions.instructions'}}
 </div>
 
 <div class='table staff-actions'>
   <div class="heading-container">
-    <div class="col heading first staff_user">{{i18n admin.logs.staff_actions.staff_user}}</div>
-    <div class="col heading action">{{i18n admin.logs.action}}</div>
-    <div class="col heading subject">{{i18n admin.logs.staff_actions.subject}}</div>
-    <div class="col heading created_at">{{i18n admin.logs.staff_actions.when}}</div>
-    <div class="col heading details">{{i18n admin.logs.staff_actions.details}}</div>
-    <div class="col heading context">{{i18n admin.logs.staff_actions.context}}</div>
+    <div class="col heading first staff_user">{{i18n 'admin.logs.staff_actions.staff_user'}}</div>
+    <div class="col heading action">{{i18n 'admin.logs.action'}}</div>
+    <div class="col heading subject">{{i18n 'admin.logs.staff_actions.subject'}}</div>
+    <div class="col heading created_at">{{i18n 'admin.logs.staff_actions.when'}}</div>
+    <div class="col heading details">{{i18n 'admin.logs.staff_actions.details'}}</div>
+    <div class="col heading context">{{i18n 'admin.logs.staff_actions.context'}}</div>
     <div class="clearfix"></div>
   </div>
 
@@ -47,7 +47,7 @@
     {{#if model.length}}
       {{view "staff-action-logs-list" content=controller}}
     {{else}}
-      {{i18n search.no_results}}
+      {{i18n 'search.no_results'}}
     {{/if}}
   {{/loading-spinner}}
 </div>
diff --git a/app/assets/javascripts/admin/templates/logs/staff_action_logs_list_item.hbs b/app/assets/javascripts/admin/templates/logs/staff_action_logs_list_item.hbs
index c0be5acc5..cbcea891a 100644
--- a/app/assets/javascripts/admin/templates/logs/staff_action_logs_list_item.hbs
+++ b/app/assets/javascripts/admin/templates/logs/staff_action_logs_list_item.hbs
@@ -18,10 +18,10 @@
 <div class="col value details">
   {{{formattedDetails}}}
   {{#if useCustomModalForDetails}}
-    <a {{action "showCustomDetailsModal" this}}>{{i18n admin.logs.staff_actions.show}}</a>
+    <a {{action "showCustomDetailsModal" this}}>{{i18n 'admin.logs.staff_actions.show'}}</a>
   {{/if}}
   {{#if useModalForDetails}}
-    <a {{action "showDetailsModal" this}}>{{i18n admin.logs.staff_actions.show}}</a>
+    <a {{action "showDetailsModal" this}}>{{i18n 'admin.logs.staff_actions.show'}}</a>
   {{/if}}
 </div>
 <div class="col value context">{{context}}</div>
diff --git a/app/assets/javascripts/admin/templates/modal/admin_agree_flag.hbs b/app/assets/javascripts/admin/templates/modal/admin_agree_flag.hbs
index 324d6f7bc..14e1ae9c5 100644
--- a/app/assets/javascripts/admin/templates/modal/admin_agree_flag.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin_agree_flag.hbs
@@ -1,11 +1,11 @@
 {{#if user_deleted}}
-  <button title="{{i18n admin.flags.agree_flag_restore_post_title}}" {{action "agreeFlagRestorePost"}} class="btn"><i class="fa fa-thumbs-o-up"></i><i class="fa fa-eye"></i>{{i18n admin.flags.agree_flag_restore_post}}</button>
+  <button title="{{i18n 'admin.flags.agree_flag_restore_post_title'}}" {{action "agreeFlagRestorePost"}} class="btn"><i class="fa fa-thumbs-o-up"></i><i class="fa fa-eye"></i>{{i18n 'admin.flags.agree_flag_restore_post'}}</button>
 {{else}}
   {{#unless postHidden}}
-    <button title="{{i18n admin.flags.agree_flag_hide_post_title}}" {{action "agreeFlagHidePost"}} class="btn"><i class="fa fa-thumbs-o-up"></i><i class="fa fa-eye-slash"></i>{{i18n admin.flags.agree_flag_hide_post}}</button>
+    <button title="{{i18n 'admin.flags.agree_flag_hide_post_title'}}" {{action "agreeFlagHidePost"}} class="btn"><i class="fa fa-thumbs-o-up"></i><i class="fa fa-eye-slash"></i>{{i18n 'admin.flags.agree_flag_hide_post'}}</button>
   {{/unless}}
 {{/if}}
-<button title="{{i18n admin.flags.agree_flag_title}}" {{action "agreeFlagKeepPost"}} class="btn"><i class="fa fa-thumbs-o-up"></i>{{i18n admin.flags.agree_flag}}</button>
+<button title="{{i18n 'admin.flags.agree_flag_title'}}" {{action "agreeFlagKeepPost"}} class="btn"><i class="fa fa-thumbs-o-up"></i>{{i18n 'admin.flags.agree_flag'}}</button>
 {{#if canDeleteAsSpammer}}
-  <button title="{{i18n admin.flags.delete_spammer_title}}" {{action "deleteSpammer" user}} class="btn btn-danger"><i class="fa fa-exclamation-triangle"></i>{{i18n admin.flags.delete_spammer}}</button>
+  <button title="{{i18n 'admin.flags.delete_spammer_title'}}" {{action "deleteSpammer" user}} class="btn btn-danger"><i class="fa fa-exclamation-triangle"></i>{{i18n 'admin.flags.delete_spammer'}}</button>
 {{/if}}
diff --git a/app/assets/javascripts/admin/templates/modal/admin_badge_preview.hbs b/app/assets/javascripts/admin/templates/modal/admin_badge_preview.hbs
index d05abafdc..835a105cd 100644
--- a/app/assets/javascripts/admin/templates/modal/admin_badge_preview.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin_badge_preview.hbs
@@ -1,31 +1,31 @@
 <div class="badge-query-preview">
   {{#if errors}}
-    <p class="error-header">{{i18n admin.badges.preview.sql_error_header}}</p>
+    <p class="error-header">{{i18n 'admin.badges.preview.sql_error_header'}}</p>
 
     <pre class="badge-errors">{{errors}}</pre>
 
     <!--
     TODO we want some help pages for this, link to those instead
     <p>
-      {{i18n admin.badges.preview.error_help}}
+      {{i18n 'admin.badges.preview.error_help'}}
     </p>
     <ul>
       <li><a href="https://meta.discourse.org/t/triggered-custom-badge-queries/19336">https://meta.discourse.org/t/triggered-custom-badge-queries/19336</a></li>
     </ul>
     -->
   {{else}}
-    <p class="grant-count">{{{i18n admin.badges.preview.grant_count count=count}}}</p>
+    <p class="grant-count">{{{i18n 'admin.badges.preview.grant_count' count=count}}}</p>
 
     {{#if count_warning}}
       <div class="count-warning">
-        <p class="heading"><i class="fa fa-warning"></i> {{i18n admin.badges.preview.bad_count_warning.header}}</p>
-        <p class="body">{{i18n admin.badges.preview.bad_count_warning.text}}</p>
+        <p class="heading"><i class="fa fa-warning"></i> {{i18n 'admin.badges.preview.bad_count_warning.header'}}</p>
+        <p class="body">{{i18n 'admin.badges.preview.bad_count_warning.text'}}</p>
       </div>
     {{/if}}
 
     {{#if sample}}
       <p class="sample">
-        {{i18n admin.badges.preview.sample}}
+        {{i18n 'admin.badges.preview.sample'}}
       </p>
       <ul>
         {{#each html in processed_sample}}
diff --git a/app/assets/javascripts/admin/templates/modal/admin_delete_flag.hbs b/app/assets/javascripts/admin/templates/modal/admin_delete_flag.hbs
index 831ee5389..5762101a1 100644
--- a/app/assets/javascripts/admin/templates/modal/admin_delete_flag.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin_delete_flag.hbs
@@ -1,5 +1,5 @@
-<button title="{{i18n admin.flags.delete_post_defer_flag_title}}" {{action "deletePostDeferFlag"}} class="btn"><i class="fa fa-trash-o"></i><i class="fa fa-external-link"></i>{{i18n admin.flags.delete_post_defer_flag}}</button>
-<button title="{{i18n admin.flags.delete_post_agree_flag_title}}" {{action "deletePostAgreeFlag"}} class="btn"><i class="fa fa-trash-o"></i><i class="fa fa-thumbs-o-up"></i>{{i18n admin.flags.delete_post_agree_flag}}</button>
+<button title="{{i18n 'admin.flags.delete_post_defer_flag_title'}}" {{action "deletePostDeferFlag"}} class="btn"><i class="fa fa-trash-o"></i><i class="fa fa-external-link"></i>{{i18n 'admin.flags.delete_post_defer_flag'}}</button>
+<button title="{{i18n 'admin.flags.delete_post_agree_flag_title'}}" {{action "deletePostAgreeFlag"}} class="btn"><i class="fa fa-trash-o"></i><i class="fa fa-thumbs-o-up"></i>{{i18n 'admin.flags.delete_post_agree_flag'}}</button>
 {{#if canDeleteAsSpammer}}
-  <button title="{{i18n admin.flags.delete_spammer_title}}" {{action "deleteSpammer" user}} class="btn btn-danger"><i class="fa fa-exclamation-triangle"></i>{{i18n admin.flags.delete_spammer}}</button>
+  <button title="{{i18n 'admin.flags.delete_spammer_title'}}" {{action "deleteSpammer" user}} class="btn btn-danger"><i class="fa fa-exclamation-triangle"></i>{{i18n 'admin.flags.delete_spammer'}}</button>
 {{/if}}
diff --git a/app/assets/javascripts/admin/templates/modal/admin_edit_badge_groupings.hbs b/app/assets/javascripts/admin/templates/modal/admin_edit_badge_groupings.hbs
index 0cb9eb9ca..8c32447c2 100644
--- a/app/assets/javascripts/admin/templates/modal/admin_edit_badge_groupings.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin_edit_badge_groupings.hbs
@@ -20,9 +20,9 @@
     {{/each}}
     </ul>
   </div>
-  <button class='btn' {{action "add"}}>{{i18n admin.badges.new}}</button>
+  <button class='btn' {{action "add"}}>{{i18n 'admin.badges.new'}}</button>
 </div>
 <div class="modal-footer">
-  <button class='btn btn-primary' {{action "saveAll"}} {{bind-attr disabled="submitDisabled"}}>{{i18n admin.badges.save}}</button>
-  <a {{action "cancel"}}>{{i18n cancel}}</a>
+  <button class='btn btn-primary' {{action "saveAll"}} {{bind-attr disabled="submitDisabled"}}>{{i18n 'admin.badges.save'}}</button>
+  <a {{action "cancel"}}>{{i18n 'cancel'}}</a>
 </div>
diff --git a/app/assets/javascripts/admin/templates/modal/admin_start_backup.hbs b/app/assets/javascripts/admin/templates/modal/admin_start_backup.hbs
index 4967f31e6..93a3a96bc 100644
--- a/app/assets/javascripts/admin/templates/modal/admin_start_backup.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin_start_backup.hbs
@@ -1,3 +1,3 @@
-<button {{action "startBackup"}} class="btn btn-primary">{{i18n yes_value}}</button>
-<button {{action "startBackupWithoutUpload"}} class="btn">{{i18n admin.backups.operations.backup.without_uploads}}</button>
-<button {{action "cancel"}} class="btn">{{i18n no_value}}</button>
+<button {{action "startBackup"}} class="btn btn-primary">{{i18n 'yes_value'}}</button>
+<button {{action "startBackupWithoutUpload"}} class="btn">{{i18n 'admin.backups.operations.backup.without_uploads'}}</button>
+<button {{action "cancel"}} class="btn">{{i18n 'no_value'}}</button>
diff --git a/app/assets/javascripts/admin/templates/modal/admin_suspend_user.hbs b/app/assets/javascripts/admin/templates/modal/admin_suspend_user.hbs
index 1f3198246..7a82cc071 100644
--- a/app/assets/javascripts/admin/templates/modal/admin_suspend_user.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin_suspend_user.hbs
@@ -1,15 +1,15 @@
 <div class="modal-body">
   <form>
-    {{i18n admin.user.suspend_duration}}
+    {{i18n 'admin.user.suspend_duration'}}
     {{text-field value=duration maxlength="5" autofocus="autofocus"}}
-    {{i18n admin.user.suspend_duration_units}}<br/>
+    {{i18n 'admin.user.suspend_duration_units'}}<br/>
     <br/>
-    {{{i18n admin.user.suspend_reason_label}}}<br/>
+    {{{i18n 'admin.user.suspend_reason_label'}}}<br/>
     <br/>
     {{text-field value=reason class="span8"}}
   </form>
 </div>
 <div class="modal-footer">
-  <button class='btn btn-danger' {{action "suspend"}} {{bind-attr disabled="submitDisabled"}}><i class='fa fa-ban'></i>{{i18n admin.user.suspend}}</button>
-  <a {{action "closeModal"}}>{{i18n cancel}}</a>
+  <button class='btn btn-danger' {{action "suspend"}} {{bind-attr disabled="submitDisabled"}}><i class='fa fa-ban'></i>{{i18n 'admin.user.suspend'}}</button>
+  <a {{action "closeModal"}}>{{i18n 'cancel'}}</a>
 </div>
diff --git a/app/assets/javascripts/admin/templates/reports.hbs b/app/assets/javascripts/admin/templates/reports.hbs
index e1f011b5a..98e709740 100644
--- a/app/assets/javascripts/admin/templates/reports.hbs
+++ b/app/assets/javascripts/admin/templates/reports.hbs
@@ -1,22 +1,22 @@
 <h3>{{title}}</h3>
 
 <div>
-  {{i18n admin.dashboard.reports.start_date}} {{input type="date" value=startDate}}
-  {{i18n admin.dashboard.reports.end_date}} {{input type="date" value=endDate}}
-  <button {{action "refreshReport"}} class='btn btn-primary'>{{i18n admin.dashboard.reports.refresh_report}}</button>
+  {{i18n 'admin.dashboard.reports.start_date'}} {{input type="date" value=startDate}}
+  {{i18n 'admin.dashboard.reports.end_date'}} {{input type="date" value=endDate}}
+  <button {{action "refreshReport"}} class='btn btn-primary'>{{i18n 'admin.dashboard.reports.refresh_report'}}</button>
 </div>
 
 <div class='view-options'>
   {{#if viewingTable}}
-    {{i18n admin.dashboard.reports.view_table}}
+    {{i18n 'admin.dashboard.reports.view_table'}}
   {{else}}
-    <a href {{action "viewAsTable"}}>{{i18n admin.dashboard.reports.view_table}}</a>
+    <a href {{action "viewAsTable"}}>{{i18n 'admin.dashboard.reports.view_table'}}</a>
   {{/if}}
   |
   {{#if viewingBarChart}}
-    {{i18n admin.dashboard.reports.view_chart}}
+    {{i18n 'admin.dashboard.reports.view_chart'}}
   {{else}}
-    <a href {{action "viewAsBarChart"}}>{{i18n admin.dashboard.reports.view_chart}}</a>
+    <a href {{action "viewAsBarChart"}}>{{i18n 'admin.dashboard.reports.view_chart'}}</a>
   {{/if}}
 </div>
 
diff --git a/app/assets/javascripts/admin/templates/site_settings.hbs b/app/assets/javascripts/admin/templates/site_settings.hbs
index 440c919d2..e1bbacc1f 100644
--- a/app/assets/javascripts/admin/templates/site_settings.hbs
+++ b/app/assets/javascripts/admin/templates/site_settings.hbs
@@ -2,12 +2,12 @@
   <div class='search controls'>
     <label>
       {{input type="checkbox" checked=onlyOverridden}}
-      {{i18n admin.site_settings.show_overriden}}
+      {{i18n 'admin.site_settings.show_overriden'}}
     </label>
   </div>
   <div class='controls'>
     {{text-field value=filter placeholderKey="type_to_filter"}}
-    <button {{action "clearFilter"}} class="btn">{{i18n admin.site_settings.clear_filter}}</button>
+    <button {{action "clearFilter"}} class="btn">{{i18n 'admin.site_settings.clear_filter'}}</button>
   </div>
 </div>
 
diff --git a/app/assets/javascripts/admin/templates/site_settings/setting_bool.hbs b/app/assets/javascripts/admin/templates/site_settings/setting_bool.hbs
index 66939c4da..2e1a5c997 100644
--- a/app/assets/javascripts/admin/templates/site_settings/setting_bool.hbs
+++ b/app/assets/javascripts/admin/templates/site_settings/setting_bool.hbs
@@ -14,6 +14,6 @@
   </div>
 {{else}}
   {{#if overridden}}
-    <button class='btn' href='#' {{action "resetDefault" this}}><i class="fa fa-undo"></i>{{i18n admin.site_settings.reset}}</button>
+    <button class='btn' href='#' {{action "resetDefault" this}}><i class="fa fa-undo"></i>{{i18n 'admin.site_settings.reset'}}</button>
   {{/if}}
 {{/if}}
diff --git a/app/assets/javascripts/admin/templates/site_settings/setting_enum.hbs b/app/assets/javascripts/admin/templates/site_settings/setting_enum.hbs
index c53b1cf5d..9a9ff20fc 100644
--- a/app/assets/javascripts/admin/templates/site_settings/setting_enum.hbs
+++ b/app/assets/javascripts/admin/templates/site_settings/setting_enum.hbs
@@ -12,6 +12,6 @@
   </div>
 {{else}}
   {{#if overridden}}
-    <button class='btn' href='#' {{action "resetDefault" this}}><i class="fa fa-undo"></i>{{i18n admin.site_settings.reset}}</button>
+    <button class='btn' href='#' {{action "resetDefault" this}}><i class="fa fa-undo"></i>{{i18n 'admin.site_settings.reset'}}</button>
   {{/if}}
 {{/if}}
diff --git a/app/assets/javascripts/admin/templates/site_settings/setting_list.hbs b/app/assets/javascripts/admin/templates/site_settings/setting_list.hbs
index f50e4214f..802a53324 100644
--- a/app/assets/javascripts/admin/templates/site_settings/setting_list.hbs
+++ b/app/assets/javascripts/admin/templates/site_settings/setting_list.hbs
@@ -12,6 +12,6 @@
     </div>
 {{else}}
   {{#if overridden}}
-      <button class='btn' href='#' {{action "resetDefault" this}}><i class="fa fa-undo"></i>{{i18n admin.site_settings.reset}}</button>
+      <button class='btn' href='#' {{action "resetDefault" this}}><i class="fa fa-undo"></i>{{i18n 'admin.site_settings.reset'}}</button>
   {{/if}}
 {{/if}}
diff --git a/app/assets/javascripts/admin/templates/site_settings/setting_string.hbs b/app/assets/javascripts/admin/templates/site_settings/setting_string.hbs
index a5369cd15..52279773b 100644
--- a/app/assets/javascripts/admin/templates/site_settings/setting_string.hbs
+++ b/app/assets/javascripts/admin/templates/site_settings/setting_string.hbs
@@ -13,6 +13,6 @@
   </div>
 {{else}}
   {{#if overridden}}
-    <button class='btn' href='#' {{action "resetDefault" this}}><i class="fa fa-undo"></i>{{i18n admin.site_settings.reset}}</button>
+    <button class='btn' href='#' {{action "resetDefault" this}}><i class="fa fa-undo"></i>{{i18n 'admin.site_settings.reset'}}</button>
   {{/if}}
 {{/if}}
diff --git a/app/assets/javascripts/admin/templates/site_settings_category.hbs b/app/assets/javascripts/admin/templates/site_settings_category.hbs
index c7a762e29..002baae2e 100644
--- a/app/assets/javascripts/admin/templates/site_settings_category.hbs
+++ b/app/assets/javascripts/admin/templates/site_settings_category.hbs
@@ -2,5 +2,5 @@
   {{collection contentBinding="filteredContent" classNames="form-horizontal settings" itemView="site-setting"}}
 {{else}}
   <br/>
-  {{i18n admin.site_settings.no_results}}
+  {{i18n 'admin.site_settings.no_results'}}
 {{/if}}
diff --git a/app/assets/javascripts/admin/templates/site_text_edit.hbs b/app/assets/javascripts/admin/templates/site_text_edit.hbs
index d87d17bd5..6db9dd716 100644
--- a/app/assets/javascripts/admin/templates/site_text_edit.hbs
+++ b/app/assets/javascripts/admin/templates/site_text_edit.hbs
@@ -17,10 +17,10 @@
 <div class='controls'>
   <button class='btn' {{action "saveChanges"}} {{bind-attr disabled="saveDisabled"}}>
     {{#if saving}}
-      {{i18n saving}}
+      {{i18n 'saving'}}
     {{else}}
-      {{i18n save}}
+      {{i18n 'save'}}
     {{/if}}
   </button>
-  {{#if saved}}{{i18n saved}}{{/if}}
+  {{#if saved}}{{i18n 'saved'}}{{/if}}
 </div>
diff --git a/app/assets/javascripts/admin/templates/site_text_index.hbs b/app/assets/javascripts/admin/templates/site_text_index.hbs
index 71b256c9c..5a448def3 100644
--- a/app/assets/javascripts/admin/templates/site_text_index.hbs
+++ b/app/assets/javascripts/admin/templates/site_text_index.hbs
@@ -1 +1 @@
-<p>{{i18n admin.site_text.none}}</p>
+<p>{{i18n 'admin.site_text.none'}}</p>
diff --git a/app/assets/javascripts/admin/templates/user-fields.hbs b/app/assets/javascripts/admin/templates/user-fields.hbs
index c829ef18c..d20eac4dd 100644
--- a/app/assets/javascripts/admin/templates/user-fields.hbs
+++ b/app/assets/javascripts/admin/templates/user-fields.hbs
@@ -1,7 +1,7 @@
 <div class='user-fields'>
-  <h2>{{i18n admin.user_fields.title}}</h2>
+  <h2>{{i18n 'admin.user_fields.title'}}</h2>
 
-  <p class="desc">{{i18n admin.user_fields.help}}</p>
+  <p class="desc">{{i18n 'admin.user_fields.help'}}</p>
 
   {{#if model}}
     {{#each f in model itemController="admin-user-field-item" itemView="admin-user-field-item"}}
@@ -17,19 +17,19 @@
             {{combo-box content=fieldTypes valueAttribute="id" value=f.buffered.field_type}}
           </div>
           <div class='form-element controls'>
-            <button {{action "save"}}class='btn btn-primary'>{{fa-icon 'check'}} {{i18n admin.user_fields.save}}</button>
-            <button {{action "cancel"}} class='btn btn-danger'>{{fa-icon 'times'}} {{i18n admin.user_fields.cancel}}</button>
+            <button {{action "save"}}class='btn btn-primary'>{{fa-icon 'check'}} {{i18n 'admin.user_fields.save'}}</button>
+            <button {{action "cancel"}} class='btn btn-danger'>{{fa-icon 'times'}} {{i18n 'admin.user_fields.cancel'}}</button>
           </div>
         </div>
         <div class="row">
           <div class='form-element'>
             <label>
-              {{input type="checkbox" checked=f.buffered.editable}} {{i18n admin.user_fields.editable.title}}
+              {{input type="checkbox" checked=f.buffered.editable}} {{i18n 'admin.user_fields.editable.title'}}
             </label>
           </div>
           <div class='form-element'>
             <label>
-              {{input type="checkbox" checked=f.buffered.required}} {{i18n admin.user_fields.required.title}}
+              {{input type="checkbox" checked=f.buffered.required}} {{i18n 'admin.user_fields.required.title'}}
             </label>
           </div>
         </div>
@@ -41,8 +41,8 @@
           <div class='form-display'>
           </div>
           <div class='form-element controls'>
-            <button {{action "edit"}}class='btn btn-default'>{{fa-icon 'pencil'}} {{i18n admin.user_fields.edit}}</button>
-            <button {{action "destroy"}}class='btn btn-danger'>{{fa-icon 'trash-o'}} {{i18n admin.user_fields.delete}}</button>
+            <button {{action "edit"}}class='btn btn-default'>{{fa-icon 'pencil'}} {{i18n 'admin.user_fields.edit'}}</button>
+            <button {{action "destroy"}}class='btn btn-danger'>{{fa-icon 'trash-o'}} {{i18n 'admin.user_fields.delete'}}</button>
           </div>
         </div>
         <div class="row">{{f.flags}}</div>
@@ -53,6 +53,6 @@
 
   <button {{bind-attr disabled="createDisabled"}} class='btn btn-primary' {{action "createField"}}>
     {{fa-icon "plus"}}
-    {{i18n admin.user_fields.create}}
+    {{i18n 'admin.user_fields.create'}}
   </button>
 </div>
diff --git a/app/assets/javascripts/admin/templates/user_badges.hbs b/app/assets/javascripts/admin/templates/user_badges.hbs
index c454e4a7d..a4bfc236e 100644
--- a/app/assets/javascripts/admin/templates/user_badges.hbs
+++ b/app/assets/javascripts/admin/templates/user_badges.hbs
@@ -8,26 +8,26 @@
 
 {{#loading-spinner condition=loading}}
   <div class='admin-container user-badges'>
-    <h2>{{i18n admin.badges.grant_badge}}</h2>
+    <h2>{{i18n 'admin.badges.grant_badge'}}</h2>
     {{#if noBadges}}
-      <p>{{i18n admin.badges.no_badges}}</p>
+      <p>{{i18n 'admin.badges.no_badges'}}</p>
     {{else}}
       <br>
       {{combo-box valueAttribute="id" value=controller.selectedBadgeId content=controller.grantableBadges}}
-      <button class='btn btn-primary' {{action "grantBadge" controller.selectedBadgeId}}>{{i18n admin.badges.grant}}</button>
+      <button class='btn btn-primary' {{action "grantBadge" controller.selectedBadgeId}}>{{i18n 'admin.badges.grant'}}</button>
     {{/if}}
 
     <br>
     <br>
 
-    <h2>{{i18n admin.badges.granted_badges}}</h2>
+    <h2>{{i18n 'admin.badges.granted_badges'}}</h2>
     <br>
 
     <table>
       <tr>
-        <th>{{i18n admin.badges.badge}}</th>
-        <th>{{i18n admin.badges.granted_by}}</th>
-        <th>{{i18n admin.badges.granted_at}}</th>
+        <th>{{i18n 'admin.badges.badge'}}</th>
+        <th>{{i18n 'admin.badges.granted_by'}}</th>
+        <th>{{i18n 'admin.badges.granted_at'}}</th>
         <th></th>
       </tr>
 
@@ -42,13 +42,13 @@
           </td>
           <td>{{age-with-tooltip granted_at}}</td>
           <td>
-            <button class='btn' {{action "revokeBadge" this}}>{{i18n admin.badges.revoke}}</button>
+            <button class='btn' {{action "revokeBadge" this}}>{{i18n 'admin.badges.revoke'}}</button>
           </td>
         </tr>
       {{else}}
         <tr>
           <td colspan="5">
-            <p>{{i18n admin.badges.no_user_badges name=user.username}}</p>
+            <p>{{i18n 'admin.badges.no_user_badges' name=user.username}}</p>
           </td>
         </tr>
       {{/each}}
diff --git a/app/assets/javascripts/admin/templates/user_index.hbs b/app/assets/javascripts/admin/templates/user_index.hbs
index 63b9d6425..a3725767e 100644
--- a/app/assets/javascripts/admin/templates/user_index.hbs
+++ b/app/assets/javascripts/admin/templates/user_index.hbs
@@ -4,68 +4,68 @@
     {{#if active}}
       {{#link-to 'user' model class="btn"}}
         <i class='fa fa-user'></i>
-        {{i18n admin.user.show_public_profile}}
+        {{i18n 'admin.user.show_public_profile'}}
       {{/link-to}}
       {{#if can_impersonate}}
-          <button class='btn btn-danger' {{action "impersonate" target="content"}} title="{{i18n admin.impersonate.help}}">
+          <button class='btn btn-danger' {{action "impersonate" target="content"}} title="{{i18n 'admin.impersonate.help'}}">
             <i class='fa fa-crosshairs'></i>
-            {{i18n admin.impersonate.title}}
+            {{i18n 'admin.impersonate.title'}}
           </button>
       {{/if}}
       {{#if currentUser.admin}}
       <button class='btn' {{action "log_out" target="content"}}>
         <i class='fa fa-power-off'></i>
-        {{i18n admin.user.log_out}}
+        {{i18n 'admin.user.log_out'}}
       </button>
       {{/if}}
     {{/if}}
   </div>
 
   <div class='display-row username'>
-    <div class='field'>{{i18n user.username.title}}</div>
+    <div class='field'>{{i18n 'user.username.title'}}</div>
     <div class='value'>{{username}}</div>
     <div class='controls'>
       {{#link-to 'preferences.username' model class="btn"}}
         <i class='fa fa-pencil'></i>
-        {{i18n user.change_username.title}}
+        {{i18n 'user.change_username.title'}}
       {{/link-to}}
     </div>
   </div>
 
   {{#if canCheckEmails}}
     <div class='display-row email'>
-      <div class='field'>{{i18n user.email.title}}</div>
+      <div class='field'>{{i18n 'user.email.title'}}</div>
       <div class='value'>
         {{#unless active}}
-          <div class='controls'>{{i18n admin.users.not_verified}}</div>
+          <div class='controls'>{{i18n 'admin.users.not_verified'}}</div>
         {{/unless}}
         {{#if email}}
           <a href="mailto:{{unbound email}}">{{email}}</a>
         {{else}}
-          <button class="btn" title="{{i18n admin.users.check_email.title}}" {{action "checkEmail" this}}>{{fa-icon "envelope-o"}} {{i18n admin.users.check_email.text}}</button>
+          <button class="btn" title="{{i18n 'admin.users.check_email.title'}}" {{action "checkEmail" this}}>{{fa-icon "envelope-o"}} {{i18n 'admin.users.check_email.text'}}</button>
         {{/if}}
       </div>
     </div>
 
     <div class='display-row associations'>
-      <div class='field'>{{i18n user.associated_accounts}}</div>
+      <div class='field'>{{i18n 'user.associated_accounts'}}</div>
       <div class='value'>
         {{#if associated_accounts}}
           {{associated_accounts}}
         {{else}}
-          <button class="btn" title="{{i18n admin.users.check_email.title}}" {{action "checkEmail" this}}>{{fa-icon "envelope-o"}} {{i18n admin.users.check_email.text}}</button>
+          <button class="btn" title="{{i18n 'admin.users.check_email.title'}}" {{action "checkEmail" this}}>{{fa-icon "envelope-o"}} {{i18n 'admin.users.check_email.text'}}</button>
         {{/if}}
       </div>
     </div>
   {{/if}}
 
   <div class='display-row'>
-    <div class='field'>{{i18n user.avatar.title}}</div>
+    <div class='field'>{{i18n 'user.avatar.title'}}</div>
     <div class='value'>{{avatar content imageSize="large"}}</div>
   </div>
 
   <div class='display-row'>
-    <div class='field'>{{i18n user.title.title}}</div>
+    <div class='field'>{{i18n 'user.title.title'}}</div>
     <div class='value'>
       {{#if editingTitle}}
         {{text-field value=title autofocus="autofocus"}}
@@ -75,23 +75,23 @@
     </div>
     <div class='controls'>
       {{#if editingTitle}}
-        <button class='btn' {{action "saveTitle"}}>{{i18n admin.user.save_title}}</button>
-        <a href="#" {{action "toggleTitleEdit"}}>{{i18n cancel}}</a>
+        <button class='btn' {{action "saveTitle"}}>{{i18n 'admin.user.save_title'}}</button>
+        <a href="#" {{action "toggleTitleEdit"}}>{{i18n 'cancel'}}</a>
       {{else}}
-        <button class='btn' {{action "toggleTitleEdit"}}><i class="fa fa-pencil"></i>{{i18n admin.user.edit_title}}</button>
+        <button class='btn' {{action "toggleTitleEdit"}}><i class="fa fa-pencil"></i>{{i18n 'admin.user.edit_title'}}</button>
       {{/if}}
     </div>
   </div>
 
   {{#if currentUser.admin}}
     <div class='display-row'>
-      <div class='field'>{{i18n admin.groups.title}}</div>
+      <div class='field'>{{i18n 'admin.groups.title'}}</div>
       <div class='value'>
         {{admin-group-selector selected=model.groups available=availableGroups}}
       </div>
       <div class='controls'>
         {{#if custom_groups}}
-          {{i18n admin.groups.primary}}
+          {{i18n 'admin.groups.primary'}}
           {{combo-box content=custom_groups value=primary_group_id nameProperty="name" none="admin.groups.no_primary"}}
         {{/if}}
         {{#if primaryGroupDirty}}
@@ -103,12 +103,12 @@
   {{/if}}
 
   <div class='display-row'>
-    <div class='field'>{{i18n user.ip_address.title}}</div>
+    <div class='field'>{{i18n 'user.ip_address.title'}}</div>
     <div class='value'>{{ip_address}}</div>
     <div class='controls'>
       {{#if currentUser.staff}}
         <button class='btn' {{action "refreshBrowsers" target="content"}}>
-          {{i18n admin.user.refresh_browsers}}
+          {{i18n 'admin.user.refresh_browsers'}}
         </button>
         {{ip-lookup ip=ip_address userId=id}}
       {{/if}}
@@ -116,7 +116,7 @@
   </div>
 
   <div class='display-row'>
-    <div class='field'>{{i18n user.registration_ip_address.title}}</div>
+    <div class='field'>{{i18n 'user.registration_ip_address.title'}}</div>
     <div class='value'>{{registration_ip_address}}</div>
     <div class='controls'>
       {{#if currentUser.staff}}
@@ -127,12 +127,12 @@
 
   {{#if showBadges}}
     <div class='display-row'>
-      <div class='field'>{{i18n admin.badges.title}}</div>
+      <div class='field'>{{i18n 'admin.badges.title'}}</div>
       <div class='value'>
-        {{i18n badges.badge_count count=badge_count}}
+        {{i18n 'badges.badge_count' count=badge_count}}
       </div>
       <div class='controls'>
-        {{#link-to 'adminUser.badges' this class="btn"}}<i class="fa fa-certificate"></i>{{i18n admin.badges.edit_badges}}{{/link-to}}
+        {{#link-to 'adminUser.badges' this class="btn"}}<i class="fa fa-certificate"></i>{{i18n 'admin.badges.edit_badges'}}{{/link-to}}
       </div>
     </div>
   {{/if}}
@@ -157,30 +157,30 @@
 
 
 <section class='details'>
-  <h1>{{i18n admin.user.permissions}}</h1>
+  <h1>{{i18n 'admin.user.permissions'}}</h1>
 
   {{#if showApproval}}
     <div class='display-row'>
-      <div class='field'>{{i18n admin.users.approved}}</div>
+      <div class='field'>{{i18n 'admin.users.approved'}}</div>
       <div class='value'>
         {{#if approved}}
-          {{i18n admin.user.approved_by}}
+          {{i18n 'admin.user.approved_by'}}
 
           {{#link-to 'adminUser' approvedBy}}{{avatar approvedBy imageSize="small"}}{{/link-to}}
           {{#link-to 'adminUser' approvedBy}}{{approvedBy.username}}{{/link-to}}
         {{else}}
-          {{i18n no_value}}
+          {{i18n 'no_value'}}
         {{/if}}
 
       </div>
       <div class='controls'>
         {{#if approved}}
-          {{i18n admin.user.approve_success}}
+          {{i18n 'admin.user.approve_success'}}
         {{else}}
           {{#if can_approve}}
             <button class='btn' {{action "approve" target="content"}}>
               <i class='fa fa-check'></i>
-              {{i18n admin.user.approve}}
+              {{i18n 'admin.user.approve'}}
             </button>
           {{/if}}
         {{/if}}
@@ -189,31 +189,31 @@
   {{/if}}
 
   <div class='display-row'>
-    <div class='field'>{{i18n admin.users.active}}</div>
+    <div class='field'>{{i18n 'admin.users.active'}}</div>
     <div class='value'>
       {{#if active}}
-        {{i18n yes_value}}
+        {{i18n 'yes_value'}}
       {{else}}
-        {{i18n no_value}}
+        {{i18n 'no_value'}}
       {{/if}}
     </div>
     <div class='controls'>
       {{#if active}}
         {{#if can_deactivate}}
-          <button class='btn' {{action "deactivate" target="content"}}>{{i18n admin.user.deactivate_account}}</button>
-          {{i18n admin.user.deactivate_explanation}}
+          <button class='btn' {{action "deactivate" target="content"}}>{{i18n 'admin.user.deactivate_account'}}</button>
+          {{i18n 'admin.user.deactivate_explanation'}}
         {{/if}}
       {{else}}
         {{#if can_send_activation_email}}
           <button class='btn' {{action "sendActivationEmail" target="content"}}>
             <i class='fa fa-envelope'></i>
-            {{i18n admin.user.send_activation_email}}
+            {{i18n 'admin.user.send_activation_email'}}
           </button>
         {{/if}}
         {{#if can_activate}}
           <button class='btn' {{action "activate" target="content"}}>
             <i class='fa fa-check'></i>
-            {{i18n admin.user.activate}}
+            {{i18n 'admin.user.activate'}}
           </button>
         {{/if}}
       {{/if}}
@@ -221,57 +221,57 @@
   </div>
 
   <div class='display-row'>
-    <div class='field'>{{i18n admin.api.key}}</div>
+    <div class='field'>{{i18n 'admin.api.key'}}</div>
 
     {{#if api_key}}
       <div class='long-value'>
         {{api_key.key}}
-        <button class='btn' {{action "regenerateApiKey"}}><i class="fa fa-undo"></i>{{i18n admin.api.regenerate}}</button>
-        <button {{action "revokeApiKey"}} class="btn"><i class="fa fa-times"></i>{{i18n admin.api.revoke}}</button>
+        <button class='btn' {{action "regenerateApiKey"}}><i class="fa fa-undo"></i>{{i18n 'admin.api.regenerate'}}</button>
+        <button {{action "revokeApiKey"}} class="btn"><i class="fa fa-times"></i>{{i18n 'admin.api.revoke'}}</button>
       </div>
     {{else}}
       <div class='value'>
       &mdash;
       </div>
       <div class='controls'>
-        <button {{action "generateApiKey"}} class="btn"><i class="fa fa-key"></i>{{i18n admin.api.generate}}</button>
+        <button {{action "generateApiKey"}} class="btn"><i class="fa fa-key"></i>{{i18n 'admin.api.generate'}}</button>
       </div>
     {{/if}}
   </div>
 
   <div class='display-row'>
-    <div class='field'>{{i18n admin.user.admin}}</div>
+    <div class='field'>{{i18n 'admin.user.admin'}}</div>
     <div class='value'>{{admin}}</div>
     <div class='controls'>
       {{#if can_revoke_admin}}
         <button class='btn' {{action "revokeAdmin" target="content"}}>
           <i class='fa fa-shield'></i>
-          {{i18n admin.user.revoke_admin}}
+          {{i18n 'admin.user.revoke_admin'}}
         </button>
       {{/if}}
       {{#if can_grant_admin}}
         <button class='btn' {{action "grantAdmin" target="content"}}>
           <i class='fa fa-shield'></i>
-          {{i18n admin.user.grant_admin}}
+          {{i18n 'admin.user.grant_admin'}}
         </button>
       {{/if}}
     </div>
 
   </div>
   <div class='display-row'>
-    <div class='field'>{{i18n admin.user.moderator}}</div>
+    <div class='field'>{{i18n 'admin.user.moderator'}}</div>
     <div class='value'>{{moderator}}</div>
     <div class='controls'>
       {{#if can_revoke_moderation}}
         <button class='btn' {{action "revokeModeration" target="content"}}>
           <i class='fa fa-shield'></i>
-          {{i18n admin.user.revoke_moderation}}
+          {{i18n 'admin.user.revoke_moderation'}}
         </button>
       {{/if}}
       {{#if can_grant_moderation}}
         <button class='btn' {{action "grantModeration" target="content"}}>
           <i class='fa fa-shield'></i>
-          {{i18n admin.user.grant_moderation}}
+          {{i18n 'admin.user.grant_moderation'}}
         </button>
       {{/if}}
     </div>
@@ -279,7 +279,7 @@
   </div>
 
   <div class='display-row'>
-    <div class='field'>{{i18n trust_level}}</div>
+    <div class='field'>{{i18n 'trust_level'}}</div>
     <div class="value">
       {{combo-box content=trustLevels value=trust_level nameProperty="detailedName"}}
       {{#if dirty}}
@@ -292,36 +292,36 @@
     <div class="controls">
       {{#if model.canLockTrustLevel}}
         {{#if model.trust_level_locked}}
-        <i title='{{i18n admin.user.trust_level_locked_tip}}' {{action "lockTrustLevel" false target="model"}} class='fa fa-lock'></i> <button class="btn" {{action "lockTrustLevel" false target="model"}}>{{i18n admin.user.unlock_trust_level}}</button>
+        <i title='{{i18n 'admin.user.trust_level_locked_tip'}}' {{action "lockTrustLevel" false target="model"}} class='fa fa-lock'></i> <button class="btn" {{action "lockTrustLevel" false target="model"}}>{{i18n 'admin.user.unlock_trust_level'}}</button>
         {{else}}
-        <i title='{{i18n admin.user.trust_level_unlocked_tip}}' class='fa fa-unlock'></i> <button class="btn" {{action "lockTrustLevel" true target="model"}}>{{i18n admin.user.lock_trust_level}}</button>
+        <i title='{{i18n 'admin.user.trust_level_unlocked_tip'}}' class='fa fa-unlock'></i> <button class="btn" {{action "lockTrustLevel" true target="model"}}>{{i18n 'admin.user.lock_trust_level'}}</button>
         {{/if}}
       {{/if}}
       {{#if tl3Requirements}}
-        {{#link-to 'adminUser.tl3Requirements' this class="btn"}}{{i18n admin.user.trust_level_3_requirements}}{{/link-to}}
+        {{#link-to 'adminUser.tl3Requirements' this class="btn"}}{{i18n 'admin.user.trust_level_3_requirements'}}{{/link-to}}
       {{/if}}
 
     </div>
   </div>
 
   <div {{bind-attr class=":display-row isSuspended:highlight-danger"}}>
-    <div class='field'>{{i18n admin.user.suspended}}</div>
+    <div class='field'>{{i18n 'admin.user.suspended'}}</div>
     <div class='value'>{{isSuspended}}</div>
     <div class='controls'>
     {{#if isSuspended}}
       <button class='btn btn-danger' {{action "unsuspend" target="content"}}>
         <i class='fa fa-ban'></i>
-        {{i18n admin.user.unsuspend}}
+        {{i18n 'admin.user.unsuspend'}}
       </button>
       {{suspendDuration}}
-      {{i18n admin.user.suspended_explanation}}
+      {{i18n 'admin.user.suspended_explanation'}}
     {{else}}
       {{#if canSuspend}}
         <button class='btn btn-danger' {{action "showSuspendModal" this}}>
           <i class='fa fa-ban'></i>
-          {{i18n admin.user.suspend}}
+          {{i18n 'admin.user.suspend'}}
         </button>
-        {{i18n admin.user.suspended_explanation}}
+        {{i18n 'admin.user.suspended_explanation'}}
       {{/if}}
     {{/if}}
     </div>
@@ -329,64 +329,64 @@
 
   {{#if isSuspended}}
   <div class='display-row highlight-danger'>
-    <div class='field'>{{i18n admin.user.suspended_by}}</div>
+    <div class='field'>{{i18n 'admin.user.suspended_by'}}</div>
     <div class='value'>
       {{#link-to 'adminUser' suspendedBy}}{{avatar suspendedBy imageSize="tiny"}}{{/link-to}}
       {{#link-to 'adminUser' suspendedBy}}{{suspendedBy.username}}{{/link-to}}
     </div>
     <div class='controls'>
-      <b>{{i18n admin.user.suspend_reason}}</b>:
+      <b>{{i18n 'admin.user.suspend_reason'}}</b>:
       {{suspend_reason}}
     </div>
   </div>
   {{/if}}
 
   <div class='display-row' {{bind-attr class=":display-row blocked:highlight-danger"}}>
-    <div class='field'>{{i18n admin.user.blocked}}</div>
+    <div class='field'>{{i18n 'admin.user.blocked'}}</div>
     <div class='value'>{{blocked}}</div>
     <div class='controls'>
       {{#if blocked}}
         <button class='btn' {{action "unblock" target="content"}}>
           <i class='fa fa-thumbs-o-up'></i>
-          {{i18n admin.user.unblock}}
+          {{i18n 'admin.user.unblock'}}
         </button>
-        {{i18n admin.user.block_explanation}}
+        {{i18n 'admin.user.block_explanation'}}
       {{/if}}
     </div>
   </div>
 </section>
 
 <section class='details'>
-  <h1>{{i18n admin.user.activity}}</h1>
+  <h1>{{i18n 'admin.user.activity'}}</h1>
 
   <div class='display-row'>
-    <div class='field'>{{i18n created}}</div>
+    <div class='field'>{{i18n 'created'}}</div>
     <div class='value'>{{{created_at_age}}}</div>
   </div>
   <div class='display-row'>
-    <div class='field'>{{i18n admin.users.last_emailed}}</div>
+    <div class='field'>{{i18n 'admin.users.last_emailed'}}</div>
     <div class='value'>{{{last_emailed_age}}}</div>
   </div>
   <div class='display-row'>
-    <div class='field'>{{i18n last_seen}}</div>
+    <div class='field'>{{i18n 'last_seen'}}</div>
     <div class='value'>{{{last_seen_age}}}</div>
   </div>
   <div class='display-row'>
-    <div class='field'>{{i18n admin.user.like_count}}</div>
+    <div class='field'>{{i18n 'admin.user.like_count'}}</div>
     <div class='value'>{{like_given_count}} / {{like_count}}</div>
   </div>
   <div class='display-row'>
-    <div class='field'>{{i18n admin.user.topics_entered}}</div>
+    <div class='field'>{{i18n 'admin.user.topics_entered'}}</div>
     <div class='value'>{{topics_entered}}</div>
   </div>
   <div class='display-row'>
-    <div class='field'>{{i18n admin.user.post_count}}</div>
+    <div class='field'>{{i18n 'admin.user.post_count'}}</div>
     <div class='value'>{{post_count}}</div>
     <div class='controls'>
       {{#if can_delete_all_posts}}
         <button class='btn btn-danger' {{action "deleteAllPosts" target="content"}}>
           <i class='fa fa-trash-o'></i>
-          {{i18n admin.user.delete_all_posts}}
+          {{i18n 'admin.user.delete_all_posts'}}
         </button>
       {{else}}
         {{deleteAllPostsExplanation}}
@@ -394,54 +394,54 @@
     </div>
   </div>
   <div class='display-row'>
-    <div class='field'>{{i18n admin.user.posts_read_count}}</div>
+    <div class='field'>{{i18n 'admin.user.posts_read_count'}}</div>
     <div class='value'>{{posts_read_count}}</div>
   </div>
   <div class='display-row'>
-    <div class='field'>{{i18n admin.user.warnings_received_count}}</div>
+    <div class='field'>{{i18n 'admin.user.warnings_received_count'}}</div>
     <div class='value'>{{warnings_received_count}}</div>
   </div>
   <div class='display-row'>
-    <div class='field'>{{i18n admin.user.flags_given_received_count}}</div>
+    <div class='field'>{{i18n 'admin.user.flags_given_received_count'}}</div>
     <div class='value'>{{flags_given_count}} / {{flags_received_count}}</div>
   </div>
   <div class='display-row'>
-    <div class='field'>{{i18n admin.user.private_topics_count}}</div>
+    <div class='field'>{{i18n 'admin.user.private_topics_count'}}</div>
     <div class='value'>{{private_topics_count}}</div>
   </div>
   <div class='display-row'>
-    <div class='field'>{{i18n admin.user.time_read}}</div>
+    <div class='field'>{{i18n 'admin.user.time_read'}}</div>
     <div class='value'>{{{time_read}}}</div>
   </div>
   <div class='display-row'>
-    <div class='field'>{{i18n user.invited.days_visited}}</div>
+    <div class='field'>{{i18n 'user.invited.days_visited'}}</div>
     <div class='value'>{{{days_visited}}}</div>
   </div>
 </section>
 
 {{#if single_sign_on_record}}
 <section class='details'>
-  <h1>{{i18n admin.user.sso.title}}</h1>
+  <h1>{{i18n 'admin.user.sso.title'}}</h1>
 
   {{#with single_sign_on_record}}
     <div class='display-row'>
-      <div class='field'>{{i18n admin.user.sso.external_id}}</div>
+      <div class='field'>{{i18n 'admin.user.sso.external_id'}}</div>
       <div class='value'>{{external_id}}</div>
     </div>
     <div class='display-row'>
-      <div class='field'>{{i18n admin.user.sso.external_username}}</div>
+      <div class='field'>{{i18n 'admin.user.sso.external_username'}}</div>
       <div class='value'>{{external_username}}</div>
     </div>
     <div class='display-row'>
-      <div class='field'>{{i18n admin.user.sso.external_name}}</div>
+      <div class='field'>{{i18n 'admin.user.sso.external_name'}}</div>
       <div class='value'>{{external_name}}</div>
     </div>
     <div class='display-row'>
-      <div class='field'>{{i18n admin.user.sso.external_email}}</div>
+      <div class='field'>{{i18n 'admin.user.sso.external_email'}}</div>
       <div class='value'>{{external_email}}</div>
     </div>
     <div class='display-row'>
-      <div class='field'>{{i18n admin.user.sso.external_avatar_url}}</div>
+      <div class='field'>{{i18n 'admin.user.sso.external_avatar_url'}}</div>
       <div class='value'>{{external_avatar_url}}</div>
     </div>
   {{/with}}
@@ -452,7 +452,7 @@
   <hr/>
   <button {{bind-attr class=":btn :btn-danger :pull-right deleteForbidden:hidden"}} {{action "destroy" target="content"}} {{bind-attr disabled="deleteForbidden"}}>
     <i class="fa fa-exclamation-triangle"></i>
-    {{i18n admin.user.delete}}
+    {{i18n 'admin.user.delete'}}
   </button>
   {{#if deleteExplanation}}
     <div class="clearfix"></div>
diff --git a/app/assets/javascripts/admin/templates/user_tl3_requirements.hbs b/app/assets/javascripts/admin/templates/user_tl3_requirements.hbs
index cb57aa487..b1086cc84 100644
--- a/app/assets/javascripts/admin/templates/user_tl3_requirements.hbs
+++ b/app/assets/javascripts/admin/templates/user_tl3_requirements.hbs
@@ -2,15 +2,15 @@
   <div class='span15'>
     <ul class="nav nav-pills">
       <li>{{#link-to 'adminUser' this}}<i class="fa fa-caret-left"></i> &nbsp;{{username}}{{/link-to}}</li>
-      <li>{{#link-to 'adminUsersList.show' 'regular'}}{{i18n admin.user.trust_level_2_users}}{{/link-to}}</li>
+      <li>{{#link-to 'adminUsersList.show' 'regular'}}{{i18n 'admin.user.trust_level_2_users'}}{{/link-to}}</li>
     </ul>
   </div>
 </div>
 
 <div class="admin-container tl3-requirements">
-  <h2>{{username}} - {{i18n admin.user.tl3_requirements.title}}</h2>
+  <h2>{{username}} - {{i18n 'admin.user.tl3_requirements.title'}}</h2>
   <br/>
-  <p>{{i18n admin.user.tl3_requirements.table_title}}</p>
+  <p>{{i18n 'admin.user.tl3_requirements.table_title'}}</p>
 
   {{#with tl3Requirements}}
     <table class="table" style="width: auto;">
@@ -18,81 +18,81 @@
         <tr>
           <th></th>
           <th></th>
-          <th>{{i18n admin.user.tl3_requirements.value_heading}}</th>
-          <th>{{i18n admin.user.tl3_requirements.requirement_heading}}</th>
+          <th>{{i18n 'admin.user.tl3_requirements.value_heading'}}</th>
+          <th>{{i18n 'admin.user.tl3_requirements.requirement_heading'}}</th>
         </tr>
       </thead>
       <tbody>
         <tr>
-          <th>{{i18n admin.user.tl3_requirements.visits}}</th>
+          <th>{{i18n 'admin.user.tl3_requirements.visits'}}</th>
           <td><i {{bind-attr class=":fa met.days_visited:fa-check:fa-times"}}></i></td>
           <td>
-            {{days_visited_percent}}% ({{days_visited}} / {{time_period}} {{i18n admin.user.tl3_requirements.days}})
+            {{days_visited_percent}}% ({{days_visited}} / {{time_period}} {{i18n 'admin.user.tl3_requirements.days'}})
           </td>
           <td>{{min_days_visited_percent}}%</td>
         </tr>
         <tr>
-          <th>{{i18n admin.user.tl3_requirements.topics_replied_to}}</th>
+          <th>{{i18n 'admin.user.tl3_requirements.topics_replied_to'}}</th>
           <td><i {{bind-attr class=":fa met.topics_replied_to:fa-check:fa-times"}}></i></td>
           <td>{{num_topics_replied_to}}</td>
           <td>{{min_topics_replied_to}}</td>
         </tr>
         <tr>
-          <th>{{i18n admin.user.tl3_requirements.topics_viewed}}</th>
+          <th>{{i18n 'admin.user.tl3_requirements.topics_viewed'}}</th>
           <td><i {{bind-attr class=":fa met.topics_viewed:fa-check:fa-times"}}></i></td>
           <td>{{topics_viewed}}</td>
           <td>{{min_topics_viewed}}</td>
         </tr>
         <tr>
-          <th>{{i18n admin.user.tl3_requirements.topics_viewed_all_time}}</th>
+          <th>{{i18n 'admin.user.tl3_requirements.topics_viewed_all_time'}}</th>
           <td><i {{bind-attr class=":fa met.topics_viewed_all_time:fa-check:fa-times"}}></i></td>
           <td>{{topics_viewed_all_time}}</td>
           <td>{{min_topics_viewed_all_time}}</td>
         </tr>
         <tr>
-          <th>{{i18n admin.user.tl3_requirements.posts_read}}</th>
+          <th>{{i18n 'admin.user.tl3_requirements.posts_read'}}</th>
           <td><i {{bind-attr class=":fa met.posts_read:fa-check:fa-times"}}></i></td>
           <td>{{posts_read}}</td>
           <td>{{min_posts_read}}</td>
         </tr>
         <tr>
-          <th>{{i18n admin.user.tl3_requirements.posts_read_all_time}}</th>
+          <th>{{i18n 'admin.user.tl3_requirements.posts_read_all_time'}}</th>
           <td><i {{bind-attr class=":fa met.posts_read_all_time:fa-check:fa-times"}}></i></td>
           <td>{{posts_read_all_time}}</td>
           <td>{{min_posts_read_all_time}}</td>
         </tr>
         <tr>
-          <th>{{i18n admin.user.tl3_requirements.flagged_posts}}</th>
+          <th>{{i18n 'admin.user.tl3_requirements.flagged_posts'}}</th>
           <td><i {{bind-attr class=":fa met.flagged_posts:fa-check:fa-times"}}></i></td>
           <td>{{num_flagged_posts}}</td>
-          <td>{{i18n max_of_count count=max_flagged_posts}}</td>
+          <td>{{i18n 'max_of_count' count=max_flagged_posts}}</td>
         </tr>
         <tr>
-          <th>{{i18n admin.user.tl3_requirements.flagged_by_users}}</th>
+          <th>{{i18n 'admin.user.tl3_requirements.flagged_by_users'}}</th>
           <td><i {{bind-attr class=":fa met.flagged_by_users:fa-check:fa-times"}}></i></td>
           <td>{{num_flagged_by_users}}</td>
-          <td>{{i18n max_of_count count=max_flagged_by_users}}</td>
+          <td>{{i18n 'max_of_count' count=max_flagged_by_users}}</td>
         </tr>
         <tr>
-          <th>{{i18n admin.user.tl3_requirements.likes_given}}</th>
+          <th>{{i18n 'admin.user.tl3_requirements.likes_given'}}</th>
           <td><i {{bind-attr class=":fa met.likes_given:fa-check:fa-times"}}></i></td>
           <td>{{num_likes_given}}</td>
           <td>{{min_likes_given}}</td>
         </tr>
         <tr>
-          <th>{{i18n admin.user.tl3_requirements.likes_received}}</th>
+          <th>{{i18n 'admin.user.tl3_requirements.likes_received'}}</th>
           <td><i {{bind-attr class=":fa met.likes_received:fa-check:fa-times"}}></i></td>
           <td>{{num_likes_received}}</td>
           <td>{{min_likes_received}}</td>
         </tr>
         <tr>
-          <th>{{i18n admin.user.tl3_requirements.likes_received_days}}</th>
+          <th>{{i18n 'admin.user.tl3_requirements.likes_received_days'}}</th>
           <td><i {{bind-attr class=":fa met.likes_received_days:fa-check:fa-times"}}></i></td>
           <td>{{num_likes_received_days}}</td>
           <td>{{min_likes_received_days}}</td>
         </tr>
         <tr>
-          <th>{{i18n admin.user.tl3_requirements.likes_received_users}}</th>
+          <th>{{i18n 'admin.user.tl3_requirements.likes_received_users'}}</th>
           <td><i {{bind-attr class=":fa met.likes_received_users:fa-check:fa-times"}}></i></td>
           <td>{{num_likes_received_users}}</td>
           <td>{{min_likes_received_users}}</td>
@@ -107,31 +107,31 @@
       {{#if tl3Requirements.requirements_lost}}
         {{! tl implicitly not locked }}
         {{#if tl3Requirements.on_grace_period}}
-          <i class="fa fa-times"></i> {{i18n admin.user.tl3_requirements.on_grace_period}}
+          <i class="fa fa-times"></i> {{i18n 'admin.user.tl3_requirements.on_grace_period'}}
         {{else}} {{! not on grace period }}
-          <i class="fa fa-times"></i> {{i18n admin.user.tl3_requirements.does_not_qualify}}
-                                      {{i18n admin.user.tl3_requirements.will_be_demoted}}
+          <i class="fa fa-times"></i> {{i18n 'admin.user.tl3_requirements.does_not_qualify'}}
+                                      {{i18n 'admin.user.tl3_requirements.will_be_demoted'}}
         {{/if}}
       {{else}} {{! requirements not lost - remains tl3 }}
         {{#if tl3Requirements.trust_level_locked}}
-          <i class="fa fa-lock"></i> {{i18n admin.user.tl3_requirements.locked_will_not_be_demoted}}
+          <i class="fa fa-lock"></i> {{i18n 'admin.user.tl3_requirements.locked_will_not_be_demoted'}}
         {{else}} {{! tl not locked }}
-          <i class="fa fa-check"></i> {{i18n admin.user.tl3_requirements.qualifies}}
+          <i class="fa fa-check"></i> {{i18n 'admin.user.tl3_requirements.qualifies'}}
           {{#if tl3Requirements.on_grace_period}}
-            {{i18n admin.user.tl3_requirements.on_grace_period}}
+            {{i18n 'admin.user.tl3_requirements.on_grace_period'}}
           {{/if}}
         {{/if}}
       {{/if}}
     {{else}} {{! is not tl3 }}
       {{#if tl3Requirements.requirements_met}}
         {{! met & not tl3 - will be promoted}}
-        <i class="fa fa-check"></i> {{i18n admin.user.tl3_requirements.qualifies}}
-                                    {{i18n admin.user.tl3_requirements.will_be_promoted}}
+        <i class="fa fa-check"></i> {{i18n 'admin.user.tl3_requirements.qualifies'}}
+                                    {{i18n 'admin.user.tl3_requirements.will_be_promoted'}}
       {{else}} {{! requirements not met - remains regular }}
         {{#if tl3Requirements.trust_level_locked}}
-          <i class="fa fa-lock"></i> {{i18n admin.user.tl3_requirements.locked_will_not_be_promoted}}
+          <i class="fa fa-lock"></i> {{i18n 'admin.user.tl3_requirements.locked_will_not_be_promoted'}}
         {{else}}
-          <i class="fa fa-times"></i> {{i18n admin.user.tl3_requirements.does_not_qualify}}
+          <i class="fa fa-times"></i> {{i18n 'admin.user.tl3_requirements.does_not_qualify'}}
         {{/if}}
       {{/if}}
     {{/if}}
diff --git a/app/assets/javascripts/admin/templates/users-list-show.hbs b/app/assets/javascripts/admin/templates/users-list-show.hbs
index 339c7bb7f..750685509 100644
--- a/app/assets/javascripts/admin/templates/users-list-show.hbs
+++ b/app/assets/javascripts/admin/templates/users-list-show.hbs
@@ -14,7 +14,7 @@
   {{text-field value=listFilter placeholder=searchHint}}
   {{#unless showEmails}}
     <div class="pull-right">
-      <button {{action "showEmails"}} class="btn">{{i18n admin.users.show_emails}}</button>
+      <button {{action "showEmails"}} class="btn">{{i18n 'admin.users.show_emails'}}</button>
     </div>
   {{/unless}}
 </div>
@@ -27,16 +27,16 @@
           <th>{{input type="checkbox" checked=selectAll}}</th>
         {{/if}}
         <th>&nbsp;</th>
-        <th>{{i18n username}}</th>
-        <th>{{i18n email}}</th>
-        <th>{{i18n admin.users.last_emailed}}</th>
-        <th>{{i18n last_seen}}</th>
-        <th>{{i18n admin.user.topics_entered}}</th>
-        <th>{{i18n admin.user.posts_read_count}}</th>
-        <th>{{i18n admin.user.time_read}}</th>
-        <th>{{i18n created}}</th>
+        <th>{{i18n 'username'}}</th>
+        <th>{{i18n 'email'}}</th>
+        <th>{{i18n 'admin.users.last_emailed'}}</th>
+        <th>{{i18n 'last_seen'}}</th>
+        <th>{{i18n 'admin.user.topics_entered'}}</th>
+        <th>{{i18n 'admin.user.posts_read_count'}}</th>
+        <th>{{i18n 'admin.user.time_read'}}</th>
+        <th>{{i18n 'created'}}</th>
         {{#if showApproval}}
-          <th>{{i18n admin.users.approved}}</th>
+          <th>{{i18n 'admin.users.approved'}}</th>
         {{/if}}
         <th>&nbsp;</th>
       </tr>
@@ -64,21 +64,21 @@
           {{#if showApproval}}
           <td>
             {{#if user.approved}}
-              {{i18n yes_value}}
+              {{i18n 'yes_value'}}
             {{else}}
-              {{i18n no_value}}
+              {{i18n 'no_value'}}
             {{/if}}
           </td>
           {{/if}}
           <td>
-            {{#if user.admin}}<i class="fa fa-shield" title="{{i18n admin.title}}"></i>{{/if}}
-            {{#if user.moderator}}<i class="fa fa-shield" title="{{i18n admin.moderator}}"></i>{{/if}}
+            {{#if user.admin}}<i class="fa fa-shield" title="{{i18n 'admin.title'}}"></i>{{/if}}
+            {{#if user.moderator}}<i class="fa fa-shield" title="{{i18n 'admin.moderator'}}"></i>{{/if}}
           </td>
         </tr>
       {{/each}}
 
     </table>
   {{else}}
-    <p>{{i18n search.no_results}}</p>
+    <p>{{i18n 'search.no_results'}}</p>
   {{/if}}
 {{/loading-spinner}}
diff --git a/app/assets/javascripts/admin/templates/users_list.hbs b/app/assets/javascripts/admin/templates/users_list.hbs
index 6cdf5c5dd..9f857dec4 100644
--- a/app/assets/javascripts/admin/templates/users_list.hbs
+++ b/app/assets/javascripts/admin/templates/users_list.hbs
@@ -1,19 +1,19 @@
 <div class='admin-controls'>
   <div class='span15'>
     <ul class="nav nav-pills">
-      <li>{{#link-to 'adminUsersList.show' 'active'}}{{i18n admin.users.nav.active}}{{/link-to}}</li>
-      <li>{{#link-to 'adminUsersList.show' 'new'}}{{i18n admin.users.nav.new}}{{/link-to}}</li>
+      <li>{{#link-to 'adminUsersList.show' 'active'}}{{i18n 'admin.users.nav.active'}}{{/link-to}}</li>
+      <li>{{#link-to 'adminUsersList.show' 'new'}}{{i18n 'admin.users.nav.new'}}{{/link-to}}</li>
       {{#if siteSettings.must_approve_users}}
-        <li>{{#link-to 'adminUsersList.show' 'pending'}}{{i18n admin.users.nav.pending}}{{/link-to}}</li>
+        <li>{{#link-to 'adminUsersList.show' 'pending'}}{{i18n 'admin.users.nav.pending'}}{{/link-to}}</li>
       {{/if}}
-      <li>{{#link-to 'adminUsersList.show' 'staff'}}{{i18n admin.users.nav.staff}}{{/link-to}}</li>
-      <li>{{#link-to 'adminUsersList.show' 'suspended'}}{{i18n admin.users.nav.suspended}}{{/link-to}}</li>
-      <li>{{#link-to 'adminUsersList.show' 'blocked'}}{{i18n admin.users.nav.blocked}}{{/link-to}}</li>
-      <li>{{#link-to 'adminUsersList.show' 'suspect'}}{{i18n admin.users.nav.suspect}}{{/link-to}}</li>
+      <li>{{#link-to 'adminUsersList.show' 'staff'}}{{i18n 'admin.users.nav.staff'}}{{/link-to}}</li>
+      <li>{{#link-to 'adminUsersList.show' 'suspended'}}{{i18n 'admin.users.nav.suspended'}}{{/link-to}}</li>
+      <li>{{#link-to 'adminUsersList.show' 'blocked'}}{{i18n 'admin.users.nav.blocked'}}{{/link-to}}</li>
+      <li>{{#link-to 'adminUsersList.show' 'suspect'}}{{i18n 'admin.users.nav.suspect'}}{{/link-to}}</li>
     </ul>
   </div>
   <div class="pull-right">
-    <button {{action "exportUsers"}} class="btn" title="{{i18n admin.export_csv.users.title}}"><i class="fa fa-download"></i>{{i18n admin.export_csv.button_text}}</button>
+    <button {{action "exportUsers"}} class="btn" title="{{i18n 'admin.export_csv.users.title'}}"><i class="fa fa-download"></i>{{i18n 'admin.export_csv.button_text'}}</button>
   </div>
 </div>
 
diff --git a/app/assets/javascripts/admin/templates/version_checks.hbs b/app/assets/javascripts/admin/templates/version_checks.hbs
index 49009e47d..fefee6fec 100644
--- a/app/assets/javascripts/admin/templates/version_checks.hbs
+++ b/app/assets/javascripts/admin/templates/version_checks.hbs
@@ -5,15 +5,15 @@
           {{custom-html 'upgrade-header'}}
           <tr>
             <th>&nbsp;</th>
-            <th>{{i18n admin.dashboard.installed_version}}</th>
-            <th>{{i18n admin.dashboard.latest_version}}</th>
+            <th>{{i18n 'admin.dashboard.installed_version'}}</th>
+            <th>{{i18n 'admin.dashboard.latest_version'}}</th>
             <th>&nbsp;</th>
             <th>&nbsp;</th>
           </tr>
         </thead>
         {{#unless loading}}
           <tbody>
-            <td class="title">{{i18n admin.dashboard.version}}</td>
+            <td class="title">{{i18n 'admin.dashboard.version'}}</td>
             <td class="version-number"><a {{bind-attr href="versionCheck.gitLink"}} target="_blank">{{ versionCheck.installed_version }}</a></td>
 
             {{#if versionCheck.noCheckPerformed}}
@@ -22,7 +22,7 @@
                 <span class="icon critical-updates-available">☹</span>
               </td>
               <td class="version-notes">
-                <span class="normal-note">{{i18n admin.dashboard.no_check_performed}}</span>
+                <span class="normal-note">{{i18n 'admin.dashboard.no_check_performed'}}</span>
               </td>
             {{else}}
               {{#if versionCheck.staleData}}
@@ -37,9 +37,9 @@
                 <td class="version-notes">
                   <span class="normal-note">
                     {{#if versionCheck.version_check_pending}}
-                      {{i18n admin.dashboard.version_check_pending}}
+                      {{i18n 'admin.dashboard.version_check_pending'}}
                     {{else}}
-                      {{i18n admin.dashboard.stale_data}}
+                      {{i18n 'admin.dashboard.stale_data'}}
                     {{/if}}
                   </span>
                 </td>
@@ -60,11 +60,11 @@
                 </td>
                 <td class="version-notes">
                   {{#if versionCheck.upToDate }}
-                    {{i18n admin.dashboard.up_to_date}}
+                    {{i18n 'admin.dashboard.up_to_date'}}
                   {{else}}
-                    <span class="critical-note">{{i18n admin.dashboard.critical_available}}</span>
-                    <span class="normal-note">{{i18n admin.dashboard.updates_available}}</span>
-                    {{i18n admin.dashboard.please_upgrade}}
+                    <span class="critical-note">{{i18n 'admin.dashboard.critical_available'}}</span>
+                    <span class="normal-note">{{i18n 'admin.dashboard.updates_available'}}</span>
+                    {{i18n 'admin.dashboard.please_upgrade'}}
                   {{/if}}
                 </td>
               {{/if}}
diff --git a/app/assets/javascripts/discourse/helpers/i18n_helpers.js b/app/assets/javascripts/discourse/helpers/i18n_helpers.js
index fb9e8c7c8..69e7db0db 100644
--- a/app/assets/javascripts/discourse/helpers/i18n_helpers.js
+++ b/app/assets/javascripts/discourse/helpers/i18n_helpers.js
@@ -26,7 +26,11 @@ I18n.toHumanSize = function(number, options) {
 Handlebars.registerHelper('i18n', function(property, options) {
   // Resolve any properties
   var params = options.hash,
-    self = this;
+      self = this;
+
+  if (options.types[0] !== "STRING") {
+    Em.warn("Using the `{{i18n}}` helper without quotes is deprecated.");
+  }
 
   _.each(params, function(value, key) {
     params[key] = Em.Handlebars.get(self, value, options);
diff --git a/app/assets/javascripts/discourse/templates/about.hbs b/app/assets/javascripts/discourse/templates/about.hbs
index 4337a8158..030eb611a 100644
--- a/app/assets/javascripts/discourse/templates/about.hbs
+++ b/app/assets/javascripts/discourse/templates/about.hbs
@@ -1,12 +1,12 @@
 <div class='container body-page'>
   <section class='about'>
-    <h2>{{i18n about.title title=title}}</h2>
+    <h2>{{i18n 'about.title' title=title}}</h2>
     <p>{{description}}</p>
   </section>
 
   {{#if admins}}
     <section class='about admins'>
-      <h3>{{i18n about.our_admins}}</h3>
+      <h3>{{i18n 'about.our_admins'}}</h3>
 
       {{#each admins}}
         {{user-small user=this}}
@@ -18,7 +18,7 @@
 
   {{#if moderators}}
     <section class='about moderators'>
-      <h3>{{i18n about.our_moderators}}</h3>
+      <h3>{{i18n 'about.our_moderators'}}</h3>
 
       <div class='users'>
         {{#each moderators}}
@@ -30,31 +30,31 @@
   {{/if}}
 
   <section class='about stats'>
-    <h3>{{i18n about.stats}}</h3>
+    <h3>{{i18n 'about.stats'}}</h3>
 
     <table class='table'>
       <tr>
         <th>&nbsp;</th>
-        <th>{{i18n about.stat.all_time}}</th>
-        <th>{{i18n about.stat.last_7_days}}</th>
+        <th>{{i18n 'about.stat.all_time'}}</th>
+        <th>{{i18n 'about.stat.last_7_days'}}</th>
       </tr>
       <tr>
-        <td class='title'>{{i18n about.topic_count}}</td>
+        <td class='title'>{{i18n 'about.topic_count'}}</td>
         <td>{{number stats.topic_count}}</td>
         <td>{{number stats.topics_7_days}}</td>
       </tr>
       <tr>
-        <td>{{i18n about.post_count}}</td>
+        <td>{{i18n 'about.post_count'}}</td>
         <td>{{number stats.post_count}}</td>
         <td>{{number stats.posts_7_days}}</td>
       </tr>
       <tr>
-        <td>{{i18n about.user_count}}</td>
+        <td>{{i18n 'about.user_count'}}</td>
         <td>{{number stats.user_count}}</td>
         <td>{{number stats.users_7_days}}</td>
       </tr>
       <tr>
-        <td>{{i18n about.like_count}}</td>
+        <td>{{i18n 'about.like_count'}}</td>
         <td>{{number stats.like_count}}</td>
         <td>{{number stats.likes_7_days}}</td>
       </tr>
diff --git a/app/assets/javascripts/discourse/templates/badges/index.hbs b/app/assets/javascripts/discourse/templates/badges/index.hbs
index 35b52a7fe..a69a18527 100644
--- a/app/assets/javascripts/discourse/templates/badges/index.hbs
+++ b/app/assets/javascripts/discourse/templates/badges/index.hbs
@@ -1,5 +1,5 @@
 <div class='container badges'>
-  <h1>{{i18n badges.title}}</h1>
+  <h1>{{i18n 'badges.title'}}</h1>
 
   <table class='badges-listing'>
     <tbody>
@@ -12,7 +12,7 @@
             <td class='granted'>{{#if this.has_badge}}<i class='fa fa-check'></i>{{/if}}</td>
             <td class='badge'>{{user-badge badge=this}}</td>
             <td class='description'>{{{displayDescriptionHtml}}}</td>
-            <td class='grant-count'><span title="{{i18n badges.granted count=grant_count}}">{{grant_count}}</span></td>
+            <td class='grant-count'><span title="{{i18n 'badges.granted' count=grant_count}}">{{grant_count}}</span></td>
           </tr>
         {{/each}}
       {{/each}}
diff --git a/app/assets/javascripts/discourse/templates/badges/show.hbs b/app/assets/javascripts/discourse/templates/badges/show.hbs
index 85dc9da6a..7d69a1388 100644
--- a/app/assets/javascripts/discourse/templates/badges/show.hbs
+++ b/app/assets/javascripts/discourse/templates/badges/show.hbs
@@ -1,6 +1,6 @@
 <div class='container show-badge'>
   <h1>
-    {{#link-to 'badges.index'}}{{i18n badges.title}}{{/link-to}}
+    {{#link-to 'badges.index'}}{{i18n 'badges.title'}}{{/link-to}}
     <i class='fa fa-angle-right'></i>
     {{displayName}}
   </h1>
@@ -10,8 +10,8 @@
       <tr>
         <td class='badge'>{{user-badge badge=this}}</td>
         <td class='description'>{{displayDescription}}</td>
-        <td class='grant-count'>{{i18n badges.granted count=grant_count}}</td>
-        <td class='info'>{{i18n badges.allow_title}} {{{view.allowTitle}}}<br>{{i18n badges.multiple_grant}} {{{view.multipleGrant}}}
+        <td class='grant-count'>{{i18n 'badges.granted' count=grant_count}}</td>
+        <td class='info'>{{i18n 'badges.allow_title'}} {{{view.allowTitle}}}<br>{{i18n 'badges.multiple_grant'}} {{{view.multipleGrant}}}
         </td>
       </tr>
     </tbody>
diff --git a/app/assets/javascripts/discourse/templates/choose_topic.hbs b/app/assets/javascripts/discourse/templates/choose_topic.hbs
index c06bca4cc..d098ea8b3 100644
--- a/app/assets/javascripts/discourse/templates/choose_topic.hbs
+++ b/app/assets/javascripts/discourse/templates/choose_topic.hbs
@@ -1,12 +1,12 @@
-<label for='choose-topic-title'>{{i18n choose_topic.title.search}}</label>
+<label for='choose-topic-title'>{{i18n 'choose_topic.title.search'}}</label>
 
 {{text-field value=view.topicTitle placeholderKey="choose_topic.title.placeholder" id="choose-topic-title"}}
 
 {{#if view.loading}}
-  <p>{{i18n loading}}</p>
+  <p>{{i18n 'loading'}}</p>
 {{else}}
   {{#if view.noResults}}
-    <p>{{i18n choose_topic.none_found}}</p>
+    <p>{{i18n 'choose_topic.none_found'}}</p>
   {{else}}
     {{#each view.topics}}
       <div class='controls'>
diff --git a/app/assets/javascripts/discourse/templates/components/auto-close-form.hbs b/app/assets/javascripts/discourse/templates/components/auto-close-form.hbs
index c6fe0211c..7d5f954ad 100644
--- a/app/assets/javascripts/discourse/templates/components/auto-close-form.hbs
+++ b/app/assets/javascripts/discourse/templates/components/auto-close-form.hbs
@@ -2,7 +2,7 @@
   <div>
     <label>
       {{fa-icon clock-o}}
-      {{i18n composer.auto_close.label}}
+      {{i18n 'composer.auto_close.label'}}
       {{text-field value=autoCloseTime}}
       {{autoCloseUnits}}
     </label>
@@ -13,7 +13,7 @@
   <div>
     <label>
       {{input type="checkbox" name="autoCloseBasedOnLastPost" checked=autoCloseBasedOnLastPost}}
-      {{i18n composer.auto_close.based_on_last_post}}
+      {{i18n 'composer.auto_close.based_on_last_post'}}
     </label>
   </div>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/avatar-uploader.hbs b/app/assets/javascripts/discourse/templates/components/avatar-uploader.hbs
index 80c9517a1..028b30eab 100644
--- a/app/assets/javascripts/discourse/templates/components/avatar-uploader.hbs
+++ b/app/assets/javascripts/discourse/templates/components/avatar-uploader.hbs
@@ -1,10 +1,10 @@
 <input type="file" accept="image/*" style="display:none" />
-<button class="btn" {{action "selectFile"}} {{bind-attr disabled="uploading"}} title="{{i18n user.change_avatar.upload_title}}">
+<button class="btn" {{action "selectFile"}} {{bind-attr disabled="uploading"}} title="{{i18n 'user.change_avatar.upload_title'}}">
   <i class="fa fa-picture-o"></i>&nbsp;{{uploadButtonText}}
 </button>
 {{#if uploading}}
-  <span>{{i18n upload_selector.uploading}} {{view.uploadProgress}}%</span>
+  <span>{{i18n 'upload_selector.uploading'}} {{view.uploadProgress}}%</span>
 {{/if}}
 {{#if imageIsNotASquare}}
-  <div class="warning">{{i18n user.change_avatar.image_is_not_a_square}}</div>
+  <div class="warning">{{i18n 'user.change_avatar.image_is_not_a_square'}}</div>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/basic-topic-list.hbs b/app/assets/javascripts/discourse/templates/components/basic-topic-list.hbs
index a29a6b4f9..1cd3fbc1c 100644
--- a/app/assets/javascripts/discourse/templates/components/basic-topic-list.hbs
+++ b/app/assets/javascripts/discourse/templates/components/basic-topic-list.hbs
@@ -3,16 +3,16 @@
     <table class="topic-list">
       <thead>
         <tr>
-          <th class="default">{{i18n topic.title}}</th>
+          <th class="default">{{i18n 'topic.title'}}</th>
           {{#unless controller.hideCategory}}
-            <th class="category">{{i18n category_title}}</th>
+            <th class="category">{{i18n 'category_title'}}</th>
           {{/unless}}
-          <th class="num posts">{{i18n posts}}</th>
+          <th class="num posts">{{i18n 'posts'}}</th>
           {{#if controller.showParticipants}}
-            <th class="posters">{{i18n users}}</th>
+            <th class="posters">{{i18n 'users'}}</th>
           {{/if}}
-          <th class="num views">{{i18n views}}</th>
-          <th class="num activity">{{i18n activity}}</th>
+          <th class="num views">{{i18n 'views'}}</th>
+          <th class="num activity">{{i18n 'activity'}}</th>
         </tr>
       </thead>
 
@@ -52,7 +52,7 @@
     </table>
   {{else}}
     <div class='alert alert-info'>
-      {{i18n choose_topic.none_found}}
+      {{i18n 'choose_topic.none_found'}}
     </div>
   {{/if}}
 {{/loading-spinner}}
diff --git a/app/assets/javascripts/discourse/templates/components/category-drop.hbs b/app/assets/javascripts/discourse/templates/components/category-drop.hbs
index 835e9ceb7..d9412d0e8 100644
--- a/app/assets/javascripts/discourse/templates/components/category-drop.hbs
+++ b/app/assets/javascripts/discourse/templates/components/category-drop.hbs
@@ -7,7 +7,7 @@
   </a>
 {{else}}
   {{#if noSubcategories}}
-    <a href='#' {{action "expand"}} class='badge-category home' {{bind-attr style="badgeStyle"}}>{{i18n categories.no_subcategory}}</a>
+    <a href='#' {{action "expand"}} class='badge-category home' {{bind-attr style="badgeStyle"}}>{{i18n 'categories.no_subcategory'}}</a>
   {{else}}
     <a href='#' {{action "expand"}} class='badge-category home' {{bind-attr style="badgeStyle"}}>{{allCategoriesLabel}}</a>
   {{/if}}
@@ -18,7 +18,7 @@
   <section {{bind-attr class="expanded::hidden :category-dropdown-menu"}} class='chooser'>
     <div class='cat'><a {{bind-attr href=allCategoriesUrl}} data-drop-close="true" class='badge-category home'>{{allCategoriesLabel}}</a></div>
     {{#if subCategory}}
-    <div class='cat'><a {{bind-attr href=noCategoriesUrl}} data-drop-close="true" class='badge-category home'>{{i18n categories.no_subcategory}}</a></div>
+    <div class='cat'><a {{bind-attr href=noCategoriesUrl}} data-drop-close="true" class='badge-category home'>{{i18n 'categories.no_subcategory'}}</a></div>
     {{/if}}
     {{#if renderCategories}}
     {{#each categories}}<div class='cat'>{{category-link this allowUncategorized=true}}</div>{{/each}}
diff --git a/app/assets/javascripts/discourse/templates/components/discourse-banner.hbs b/app/assets/javascripts/discourse/templates/components/discourse-banner.hbs
index c675c2f5e..825bcc44b 100644
--- a/app/assets/javascripts/discourse/templates/components/discourse-banner.hbs
+++ b/app/assets/javascripts/discourse/templates/components/discourse-banner.hbs
@@ -1,7 +1,7 @@
 <div class="row">
   <div id="banner" {{bind-attr class="overlay"}}>
     <div id="banner-content">
-      <div class="close" {{action "dismiss"}}><i class="fa fa-times" title="{{i18n banner.close}}"></i></div>
+      <div class="close" {{action "dismiss"}}><i class="fa fa-times" title="{{i18n 'banner.close'}}"></i></div>
       {{{banner.html}}}
     </div>
   </div>
diff --git a/app/assets/javascripts/discourse/templates/components/image-uploader.hbs b/app/assets/javascripts/discourse/templates/components/image-uploader.hbs
index 67ba6ca3e..8820b7c6f 100644
--- a/app/assets/javascripts/discourse/templates/components/image-uploader.hbs
+++ b/app/assets/javascripts/discourse/templates/components/image-uploader.hbs
@@ -5,6 +5,6 @@
   {{#if backgroundStyle}}
     <button {{action "trash"}} class="btn btn-danger pad-left no-text"><i class="fa fa-trash-o"></i></button>
   {{/if}}
-  <span {{bind-attr class=":btn uploading::hidden"}}>{{i18n upload_selector.uploading}} {{uploadProgress}}%</span>
+  <span {{bind-attr class=":btn uploading::hidden"}}>{{i18n 'upload_selector.uploading'}} {{uploadProgress}}%</span>
   </div>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs b/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs
index 396235b56..d34809fa6 100644
--- a/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs
+++ b/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs
@@ -1,36 +1,36 @@
 {{#if ip}}
   <button class="btn" {{action "lookup"}}>
-    {{fa-icon "globe"}}{{i18n admin.user.ip_lookup}}
+    {{fa-icon "globe"}}{{i18n 'admin.user.ip_lookup'}}
   </button>
 {{/if}}
 {{#if show}}
   <div class="location-box">
     <a class="close pull-right" {{action "hide"}}>{{fa-icon "times"}}</a>
-    <h4>{{i18n ip_lookup.title}}</h4>
+    <h4>{{i18n 'ip_lookup.title'}}</h4>
     <dl>
       {{#if location}}
         {{#if location.hostname}}
-          <dt>{{i18n ip_lookup.hostname}}</dt>
+          <dt>{{i18n 'ip_lookup.hostname'}}</dt>
           <dd>{{location.hostname}}</dd>
         {{/if}}
 
-        <dt>{{i18n ip_lookup.location}}</dt>
+        <dt>{{i18n 'ip_lookup.location'}}</dt>
         <dd>
           {{#if location.loc}}
             <a href="https://maps.google.com/maps?q={{unbound location.loc}}" target="_blank">{{location.loc}}</a><br>
             {{city}}
           {{else}}
-            {{i18n ip_lookup.location_not_found}}
+            {{i18n 'ip_lookup.location_not_found'}}
           {{/if}}
         </dd>
 
         {{#if location.org}}
-          <dt>{{i18n ip_lookup.organisation}}</dt>
+          <dt>{{i18n 'ip_lookup.organisation'}}</dt>
           <dd>{{location.org}}</dd>
         {{/if}}
 
         {{#if location.phone}}
-          <dt>{{i18n ip_lookup.phone}}</dt>
+          <dt>{{i18n 'ip_lookup.phone'}}</dt>
           <dd>{{location.phone}}</dd>
         {{/if}}
       {{else}}
@@ -38,11 +38,11 @@
       {{/if}}
 
       <dt>
-        {{i18n ip_lookup.other_accounts}}
+        {{i18n 'ip_lookup.other_accounts'}}
         <strong>{{totalOthersWithSameIP}}</strong>
         {{#if other_accounts.length}}
           <button class="btn btn-danger pull-right" {{action "deleteOtherAccounts"}}>
-            {{fa-icon "warning"}}{{i18n ip_lookup.delete_other_accounts count=otherAccountsToDelete}}
+            {{fa-icon "warning"}}{{i18n 'ip_lookup.delete_other_accounts' count=otherAccountsToDelete}}
           </button>
         {{/if}}
       </dt>
@@ -52,11 +52,11 @@
             <table class="table table-condensed table-hover">
               <thead>
                 <tr>
-                  <th>{{i18n ip_lookup.username}}</th>
-                  <th>{{i18n ip_lookup.trust_level}}</th>
-                  <th>{{i18n ip_lookup.read_time}}</th>
-                  <th>{{i18n ip_lookup.topics_entered}}</th>
-                  <th>{{i18n ip_lookup.post_count}}</th>
+                  <th>{{i18n 'ip_lookup.username'}}</th>
+                  <th>{{i18n 'ip_lookup.trust_level'}}</th>
+                  <th>{{i18n 'ip_lookup.read_time'}}</th>
+                  <th>{{i18n 'ip_lookup.topics_entered'}}</th>
+                  <th>{{i18n 'ip_lookup.post_count'}}</th>
                 </tr>
               </thead>
               <tbody>
diff --git a/app/assets/javascripts/discourse/templates/components/private-message-map.hbs b/app/assets/javascripts/discourse/templates/components/private-message-map.hbs
index 54360aea3..87551bc80 100644
--- a/app/assets/javascripts/discourse/templates/components/private-message-map.hbs
+++ b/app/assets/javascripts/discourse/templates/components/private-message-map.hbs
@@ -1,4 +1,4 @@
-<h3><i class='fa fa-envelope'></i> {{i18n private_message_info.title}}</h3>
+<h3><i class='fa fa-envelope'></i> {{i18n 'private_message_info.title'}}</h3>
 <div class='participants clearfix'>
   {{#each details.allowed_groups}}
     <div class='user group'>
@@ -21,6 +21,6 @@
 </div>
 {{#if details.can_invite_to}}
   <div class='controls'>
-    <button class='btn' {{action "showPrivateInvite"}}>{{i18n private_message_info.invite}}</button>
+    <button class='btn' {{action "showPrivateInvite"}}>{{i18n 'private_message_info.invite'}}</button>
   </div>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/screened-ip-address-form.hbs b/app/assets/javascripts/discourse/templates/components/screened-ip-address-form.hbs
index d4a7df9a9..5f58a282c 100644
--- a/app/assets/javascripts/discourse/templates/components/screened-ip-address-form.hbs
+++ b/app/assets/javascripts/discourse/templates/components/screened-ip-address-form.hbs
@@ -1,4 +1,4 @@
-<b>{{i18n admin.logs.screened_ips.form.label}}</b>
+<b>{{i18n 'admin.logs.screened_ips.form.label'}}</b>
 {{text-field value=ip_address disabled=formSubmitted class="ip-address-input" placeholderKey="admin.logs.screened_ips.form.ip_address" autocorrect="off" autocapitalize="off"}}
 {{combo-box content=actionNames value=actionName}}
-<button class="btn" {{action "submit" target="view"}} {{bind-attr disabled="formSubmitted"}}>{{i18n admin.logs.screened_ips.form.add}}</button>
+<button class="btn" {{action "submit" target="view"}} {{bind-attr disabled="formSubmitted"}}>{{i18n 'admin.logs.screened_ips.form.add'}}</button>
diff --git a/app/assets/javascripts/discourse/templates/components/toggle-deleted.hbs b/app/assets/javascripts/discourse/templates/components/toggle-deleted.hbs
index c6b6d21c3..547546158 100644
--- a/app/assets/javascripts/discourse/templates/components/toggle-deleted.hbs
+++ b/app/assets/javascripts/discourse/templates/components/toggle-deleted.hbs
@@ -1,7 +1,7 @@
 {{#if postStream.show_deleted}}
-  <p>{{i18n deleted_filter.disabled_description}}</p>
-  <button class='btn btn-danger' {{action "toggleDeleted"}}>{{i18n deleted_filter.enable}}</button>
+  <p>{{i18n 'deleted_filter.disabled_description'}}</p>
+  <button class='btn btn-danger' {{action "toggleDeleted"}}>{{i18n 'deleted_filter.enable'}}</button>
 {{else}}
-  <p>{{i18n deleted_filter.enabled_description}}</p>
-  <button class='btn btn-danger' {{action "toggleDeleted"}}>{{i18n deleted_filter.disable}}</button>
+  <p>{{i18n 'deleted_filter.enabled_description'}}</p>
+  <button class='btn btn-danger' {{action "toggleDeleted"}}>{{i18n 'deleted_filter.disable'}}</button>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/toggle-summary.hbs b/app/assets/javascripts/discourse/templates/components/toggle-summary.hbs
index bfc26874f..803a45f47 100644
--- a/app/assets/javascripts/discourse/templates/components/toggle-summary.hbs
+++ b/app/assets/javascripts/discourse/templates/components/toggle-summary.hbs
@@ -1,12 +1,12 @@
 {{#if postStream.summary}}
-  <p>{{{i18n summary.enabled_description}}}</p>
-  <button class='btn btn-primary' {{action "toggleSummary"}}>{{i18n summary.disable}}</button>
+  <p>{{{i18n 'summary.enabled_description'}}}</p>
+  <button class='btn btn-primary' {{action "toggleSummary"}}>{{i18n 'summary.disable'}}</button>
 {{else}}
   {{#if topic.estimatedReadingTime}}
-    <p>{{{i18n summary.description_time count="topic.posts_count" readingTime="topic.estimatedReadingTime"}}}</p>
+    <p>{{{i18n 'summary.description_time' count="topic.posts_count" readingTime="topic.estimatedReadingTime"}}}</p>
   {{else}}
-    <p>{{{i18n summary.description count="topic.posts_count"}}}</p>
+    <p>{{{i18n 'summary.description' count="topic.posts_count"}}}</p>
   {{/if}}
 
-  <button class='btn btn-primary' {{action "toggleSummary"}}>{{i18n summary.enable}}</button>
+  <button class='btn btn-primary' {{action "toggleSummary"}}>{{i18n 'summary.enable'}}</button>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/topic-map.hbs b/app/assets/javascripts/discourse/templates/components/topic-map.hbs
index 1ea79eb44..e26d698d3 100644
--- a/app/assets/javascripts/discourse/templates/components/topic-map.hbs
+++ b/app/assets/javascripts/discourse/templates/components/topic-map.hbs
@@ -1,5 +1,5 @@
 <nav class='buttons'>
-  <button class='btn' {{action "toggleMap"}} title="{{i18n topic.toggle_information}}">
+  <button class='btn' {{action "toggleMap"}} title="{{i18n 'topic.toggle_information'}}">
     <i {{bind-attr class=":fa toggleMapClass"}}></i>
   </button>
 </nav>
@@ -8,40 +8,40 @@
   <ul class="clearfix">
     <li>
       <a href='{{unbound topic.url}}'>
-      <h4>{{i18n created_lowercase}}</h4>
+      <h4>{{i18n 'created_lowercase'}}</h4>
       {{avatar details.created_by imageSize="tiny"}}
       {{format-date topic.created_at}}
       </a>
     </li>
     <li>
       <a {{bind-attr href="topic.lastPostUrl"}}>
-      <h4>{{i18n last_post_lowercase}}</h4>
+      <h4>{{i18n 'last_post_lowercase'}}</h4>
       {{avatar details.last_poster imageSize="tiny"}}
       {{format-date topic.last_posted_at}}
       </a>
     </li>
     <li>
       {{posts-count-column topic=topic tagName="span"}}
-      <h4>{{i18n posts_lowercase}}</h4>
+      <h4>{{i18n 'posts_lowercase'}}</h4>
     </li>
     <li class='secondary'>
       {{number topic.views class=topic.viewsHeat}}
-      <h4>{{i18n views_lowercase}}</h4>
+      <h4>{{i18n 'views_lowercase'}}</h4>
     </li>
     <li class='secondary'>
       {{number topic.participant_count}}
-      <h4>{{i18n users_lowercase}}</h4>
+      <h4>{{i18n 'users_lowercase'}}</h4>
     </li>
     {{#if topic.like_count}}
       <li class='secondary'>
         {{number topic.like_count}}
-        <h4>{{i18n likes_lowercase}}</h4>
+        <h4>{{i18n 'likes_lowercase'}}</h4>
       </li>
     {{/if}}
     {{#if details.links.length}}
       <li class='secondary'>
         {{number details.links.length}}
-        <h4>{{i18n links_lowercase}}</h4>
+        <h4>{{i18n 'links_lowercase'}}</h4>
       </li>
     {{/if}}
     {{#if showPosterAvatar}}
@@ -68,7 +68,7 @@
           {{#each infoLinks}}
             <tr>
             <td>
-              <span class='badge badge-notification clicks' title='{{i18n topic_map.clicks count=clicks}}'>{{clicks}}</span>
+              <span class='badge badge-notification clicks' title='{{i18n 'topic_map.clicks' count=clicks}}'>{{clicks}}</span>
             </td>
             <td>
               <a href="{{unbound url}}" target="_blank" class='topic-link track-link' data-user-id="{{unbound user_id}}" data-ignore-post-id="true" title="{{unbound url}}">
@@ -82,7 +82,7 @@
 
         {{#if showAllLinksControls}}
           <div class='link-summary'>
-            <a href='#' {{action "showAllLinks"}}>{{i18n topic_map.links_shown totalLinks="details.links.length"}}</a>
+            <a href='#' {{action "showAllLinks"}}>{{i18n 'topic_map.links_shown' totalLinks="details.links.length"}}</a>
           </div>
         {{/if}}
 
diff --git a/app/assets/javascripts/discourse/templates/composer.hbs b/app/assets/javascripts/discourse/templates/composer.hbs
index d60577374..db31e4adf 100644
--- a/app/assets/javascripts/discourse/templates/composer.hbs
+++ b/app/assets/javascripts/discourse/templates/composer.hbs
@@ -7,7 +7,7 @@
   {{render "composer-messages"}}
 
   <div class='control'>
-    <a href='#' class='toggler' {{action "toggle" bubbles=false}} title='{{i18n composer.toggler}}'></a>
+    <a href='#' class='toggler' {{action "toggle" bubbles=false}} title='{{i18n 'composer.toggler'}}'></a>
 
     {{#if model.viewOpen}}
       <div class='control-row reply-area'>
@@ -21,7 +21,7 @@
                 {{text-field value=editReason tabindex="7" id="edit-reason" maxlength="255" placeholderKey="composer.edit_reason_placeholder"}}
               </div>
             {{else}}
-              <a {{action "displayEditReason"}} class="display-edit-reason">{{i18n composer.show_edit_reason}}</a>
+              <a {{action "displayEditReason"}} class="display-edit-reason">{{i18n 'composer.show_edit_reason'}}</a>
             {{/if}}
           {{/if}}
         </div>
@@ -58,7 +58,7 @@
                 {{popupInputTip validation=view.categoryValidation shownAt=view.showCategoryTip}}
               </div>
               {{#if model.archetype.hasOptions}}
-                <button class='btn' {{action "showOptions"}}>{{i18n topic.options}}</button>
+                <button class='btn' {{action "showOptions"}}>{{i18n 'topic.options'}}</button>
               {{/if}}
               {{render "additional-composer-buttons" model}}
             {{/unless}}
@@ -79,10 +79,10 @@
           <div class="composer-bottom-right">
             <a href="#" {{action "togglePreview"}} class='toggle-preview'>{{{model.toggleText}}}</a>
             <div id="file-uploading" {{bind-attr class="view.isUploading::hidden"}}>
-              {{loading-spinner size="small"}} {{i18n upload_selector.uploading}} {{view.uploadProgress}}% <a id="cancel-file-upload">{{i18n cancel}}</a>
+              {{loading-spinner size="small"}} {{i18n 'upload_selector.uploading'}} {{view.uploadProgress}}% <a id="cancel-file-upload">{{i18n 'cancel'}}</a>
             </div>
             {{#if site.mobileView}}
-              <a {{bind-attr class=":mobile-file-upload view.isUploading:hidden"}}>{{i18n upload}}</a>
+              <a {{bind-attr class=":mobile-file-upload view.isUploading:hidden"}}>{{i18n 'upload'}}</a>
               <input type="file" id="mobile-uploader" />
             {{/if}}
             <div id='draft-status'>{{model.draftStatus}}</div>
@@ -91,8 +91,8 @@
 
         {{#if currentUser}}
           <div class='submit-panel'>
-            <button {{action "save"}} tabindex="5" {{bind-attr class=":btn :btn-primary :create disableSubmit:disabled"}} title="{{i18n composer.title}}">{{{model.saveIcon}}}{{model.saveText}}</button>
-            <a href='#' {{action "cancel"}} class='cancel' tabindex="6">{{i18n cancel}}</a>
+            <button {{action "save"}} tabindex="5" {{bind-attr class=":btn :btn-primary :create disableSubmit:disabled"}} title="{{i18n 'composer.title'}}">{{{model.saveIcon}}}{{model.saveText}}</button>
+            <a href='#' {{action "cancel"}} class='cancel' tabindex="6">{{i18n 'cancel'}}</a>
           </div>
         {{/if}}
 
@@ -102,13 +102,13 @@
         <div class='span24'>
           <div class='saving-text'>
             {{#if model.createdPost}}
-              {{i18n composer.saved}} <a class='permalink' href="{{unbound createdPost.url}}" {{action "viewNewReply"}}>{{i18n composer.view_new_post}}</a>
+              {{i18n 'composer.saved'}} <a class='permalink' href="{{unbound createdPost.url}}" {{action "viewNewReply"}}>{{i18n 'composer.view_new_post'}}</a>
             {{else}}
-              {{i18n composer.saving}}
+              {{i18n 'composer.saving'}}
             {{/if}}
           </div>
           <div class='draft-text'>
-            {{i18n composer.saved_draft}}
+            {{i18n 'composer.saved_draft'}}
           </div>
         </div>
       </div>
diff --git a/app/assets/javascripts/discourse/templates/composer/similar_topics.hbs b/app/assets/javascripts/discourse/templates/composer/similar_topics.hbs
index 9f8776c21..06806e275 100644
--- a/app/assets/javascripts/discourse/templates/composer/similar_topics.hbs
+++ b/app/assets/javascripts/discourse/templates/composer/similar_topics.hbs
@@ -1,8 +1,8 @@
 <a href='#' {{action "closeMessage" this}} class='close'><i class='fa fa-times-circle'></i></a>
-<h3>{{i18n composer.similar_topics}}</h3>
+<h3>{{i18n 'composer.similar_topics'}}</h3>
 
 <ul class='topics'>
   {{#each similarTopics}}
-    <li>{{topic-link this}} <span class='posts-count'>({{{i18n topic.filters.n_posts count="posts_count"}}})</span></li>
+    <li>{{topic-link this}} <span class='posts-count'>({{{i18n 'topic.filters.n_posts' count="posts_count"}}})</span></li>
   {{/each}}
 </ul>
diff --git a/app/assets/javascripts/discourse/templates/discovery/categories.hbs b/app/assets/javascripts/discourse/templates/discovery/categories.hbs
index acf40a501..788d1d72b 100644
--- a/app/assets/javascripts/discourse/templates/discovery/categories.hbs
+++ b/app/assets/javascripts/discourse/templates/discovery/categories.hbs
@@ -3,9 +3,9 @@
     <table class='topic-list categories'>
       <thead>
         <tr>
-          <th class='category'>{{i18n categories.category}}</th>
-          <th class='latest'>{{i18n categories.latest}}</th>
-          <th class='stats topics'>{{i18n categories.topics}}</th>
+          <th class='category'>{{i18n 'categories.category'}}</th>
+          <th class='latest'>{{i18n 'categories.latest'}}</th>
+          <th class='stats topics'>{{i18n 'categories.topics'}}</th>
         </tr>
       </thead>
       <tbody>
@@ -16,10 +16,10 @@
               <div class="pull-left">
                 {{category-title-link category=this}}
                 {{#if unreadTopics}}
-                  <a href={{unbound unreadUrl}} class='badge new-posts badge-notification' title='{{i18n topic.unread_topics count="unreadTopics"}}'>{{i18n filters.unread.lower_title_with_count count="unreadTopics"}}</a>
+                  <a href={{unbound unreadUrl}} class='badge new-posts badge-notification' title='{{i18n 'topic.unread_topics' count="unreadTopics"}}'>{{i18n 'filters.unread.lower_title_with_count' count="unreadTopics"}}</a>
                 {{/if}}
                 {{#if newTopics}}
-                  <a href={{unbound newUrl}} class='badge new-posts badge-notification' title='{{i18n topic.new_topics count="newTopics"}}'>{{i18n filters.new.lower_title_with_count count="newTopics"}}</a>
+                  <a href={{unbound newUrl}} class='badge new-posts badge-notification' title='{{i18n 'topic.new_topics' count="newTopics"}}'>{{i18n 'filters.new.lower_title_with_count' count="newTopics"}}</a>
                 {{/if}}
               </div>
               <div class="clearfix"></div>
@@ -34,10 +34,10 @@
                 {{#each subcategories}}
                   {{category-link this showParent=true onlyStripe=true}}
                   {{#if unreadTopics}}
-                    <a href={{unbound unreadUrl}} class='badge new-posts badge-notification' title='{{i18n topic.unread_topics count="unreadTopics"}}'>{{unbound unreadTopics}}</a>
+                    <a href={{unbound unreadUrl}} class='badge new-posts badge-notification' title='{{i18n 'topic.unread_topics' count="unreadTopics"}}'>{{unbound unreadTopics}}</a>
                   {{/if}}
                   {{#if newTopics}}
-                    <a href={{unbound newUrl}} class='badge new-posts badge-notification' title='{{i18n topic.new_topics count="newTopics"}}'>{{unbound newTopics}}</a>
+                    <a href={{unbound newUrl}} class='badge new-posts badge-notification' title='{{i18n 'topic.new_topics' count="newTopics"}}'>{{unbound newTopics}}</a>
                   {{/if}}
                 {{/each}}
               </div>
@@ -52,7 +52,7 @@
 
                 {{#if controller.latestTopicOnly}}
                   <div class='last-user-info'>
-                    {{i18n categories.latest_by}} <a href="{{{unbound lastPosterUrl}}}">{{unbound last_poster.username}}</a>
+                    {{i18n 'categories.latest_by'}} <a href="{{{unbound lastPosterUrl}}}">{{unbound last_poster.username}}</a>
                     <a href="{{unbound lastPostUrl}}">{{format-age last_posted_at}}</a>
                   </div>
                 {{else}}
diff --git a/app/assets/javascripts/discourse/templates/discovery/topics.hbs b/app/assets/javascripts/discourse/templates/discovery/topics.hbs
index a122bc2a5..82ad64c58 100644
--- a/app/assets/javascripts/discourse/templates/discovery/topics.hbs
+++ b/app/assets/javascripts/discourse/templates/discovery/topics.hbs
@@ -5,11 +5,11 @@
 {{#if showDismissAtTop}}
   <div class="row">
     {{#if showDismissRead}}
-      <button title="{{i18n topics.bulk.dismiss_topics_tooltip}}" id='dismiss-topics-top' class='btn dismiss-read' {{action "dismissRead" "topics"}}>{{i18n topics.bulk.dismiss_topics}}</button>
-      <button title="{{i18n topics.bulk.dismiss_posts_tooltip}}" id='dismiss-posts-top' class='btn dismiss-read' {{action "dismissRead" "posts"}}>{{i18n topics.bulk.dismiss_posts}}</button>
+      <button title="{{i18n 'topics.bulk.dismiss_topics_tooltip'}}" id='dismiss-topics-top' class='btn dismiss-read' {{action "dismissRead" "topics"}}>{{i18n 'topics.bulk.dismiss_topics'}}</button>
+      <button title="{{i18n 'topics.bulk.dismiss_posts_tooltip'}}" id='dismiss-posts-top' class='btn dismiss-read' {{action "dismissRead" "posts"}}>{{i18n 'topics.bulk.dismiss_posts'}}</button>
     {{/if}}
     {{#if showResetNew}}
-      <button id='dismiss-new-top' class='btn dismiss-read' {{action "resetNew"}}>{{i18n topics.bulk.dismiss_new}}</button>
+      <button id='dismiss-new-top' class='btn dismiss-read' {{action "resetNew"}}>{{i18n 'topics.bulk.dismiss_new'}}</button>
     {{/if}}
   </div>
 {{/if}}
@@ -30,7 +30,7 @@
     <div class="show-more">
       <div class='alert alert-info clickable' {{action "showInserted"}}>
         {{countI18n topic_count_ suffix=topicTrackingState.filter count=topicTrackingState.incomingCount}}
-        {{i18n click_to_show}}
+        {{i18n 'click_to_show'}}
       </div>
     </div>
   {{/if}}
@@ -41,25 +41,25 @@
           {{#if currentUser}}
           <th class='star'>
             {{#if canBulkSelect}}
-            <button class='btn bulk-select' {{action "toggleBulkSelect"}} title="{{i18n topics.bulk.toggle}}"><i class='fa fa-list'></i></button>
+            <button class='btn bulk-select' {{action "toggleBulkSelect"}} title="{{i18n 'topics.bulk.toggle'}}"><i class='fa fa-list'></i></button>
             {{/if}}
           </th>
           {{/if}}
-          {{#sortable-heading class="default"}} {{i18n topic.title}} {{/sortable-heading}}
+          {{#sortable-heading class="default"}} {{i18n 'topic.title'}} {{/sortable-heading}}
           {{#unless controller.hideCategory}}
             {{#sortable-heading sortBy="category" action="changeSort" order=order ascending=ascending}}
-              {{i18n category_title}}
+              {{i18n 'category_title'}}
             {{/sortable-heading}}
           {{/unless}}
-          {{#sortable-heading class="posters"}} {{i18n users}} {{/sortable-heading}}
+          {{#sortable-heading class="posters"}} {{i18n 'users'}} {{/sortable-heading}}
           {{#sortable-heading sortBy="posts" number=true action="changeSort" order=order ascending=ascending}}
-            {{i18n posts}}
+            {{i18n 'posts'}}
           {{/sortable-heading}}
           {{#sortable-heading sortBy="views" number=true action="changeSort" order=order ascending=ascending}}
-            {{i18n views}}
+            {{i18n 'views'}}
           {{/sortable-heading}}
           {{#sortable-heading sortBy="activity" number=true action="changeSort" order=order ascending=ascending}}
-            {{i18n activity}}
+            {{i18n 'activity'}}
           {{/sortable-heading}}
         </tr>
       </thead>
@@ -74,11 +74,11 @@
   {{loading-spinner condition=loadingMore}}
   {{#if allLoaded}}
     {{#if showDismissRead}}
-      <button title="{{i18n topics.bulk.dismiss_topics_tooltip}}" id='dismiss-topics' class='btn dismiss-read' {{action "dismissRead" "topics"}}>{{i18n topics.bulk.dismiss_topics}}</button>
-      <button title="{{i18n topics.bulk.dismiss_posts_tooltip}}" id='dismiss-posts' class='btn dismiss-read' {{action "dismissRead" "posts"}}>{{i18n topics.bulk.dismiss_posts}}</button>
+      <button title="{{i18n 'topics.bulk.dismiss_topics_tooltip'}}" id='dismiss-topics' class='btn dismiss-read' {{action "dismissRead" "topics"}}>{{i18n 'topics.bulk.dismiss_topics'}}</button>
+      <button title="{{i18n 'topics.bulk.dismiss_posts_tooltip'}}" id='dismiss-posts' class='btn dismiss-read' {{action "dismissRead" "posts"}}>{{i18n 'topics.bulk.dismiss_posts'}}</button>
     {{/if}}
     {{#if showResetNew}}
-      <button id='dismiss-new' class='btn dismiss-read' {{action "resetNew"}}>{{i18n topics.bulk.dismiss_new}}</button>
+      <button id='dismiss-new' class='btn dismiss-read' {{action "resetNew"}}>{{i18n 'topics.bulk.dismiss_new'}}</button>
     {{/if}}
 
     {{#if latest}}
@@ -87,12 +87,12 @@
       </div>
       <h3>
         {{footerMessage}}
-        {{#if can_create_topic}}<a href='#' {{action "createTopic"}}>{{i18n topic.suggest_create_topic}}</a>{{/if}}
+        {{#if can_create_topic}}<a href='#' {{action "createTopic"}}>{{i18n 'topic.suggest_create_topic'}}</a>{{/if}}
       </h3>
     {{else}}
       {{#if top}}
         <h3>
-          {{#link-to "discovery.categories"}}{{i18n topic.browse_all_categories}}{{/link-to}}, {{#link-to 'discovery.latest'}}{{i18n topic.view_latest_topics}}{{/link-to}} {{i18n or}} {{i18n filters.top.other_periods}}
+          {{#link-to "discovery.categories"}}{{i18n 'topic.browse_all_categories'}}{{/link-to}}, {{#link-to 'discovery.latest'}}{{i18n 'topic.view_latest_topics'}}{{/link-to}} {{i18n 'or'}} {{i18n 'filters.top.other_periods'}}
         {{top-period-buttons period=period}}
         </h3>
       {{else}}
@@ -100,7 +100,7 @@
             {{{footerEducation}}}
         </div>
         <h3>
-          {{footerMessage}}{{#link-to "discovery.categories"}} {{i18n topic.browse_all_categories}}{{/link-to}} {{i18n or}} {{#link-to 'discovery.latest'}}{{i18n topic.view_latest_topics}}{{/link-to}}
+          {{footerMessage}}{{#link-to "discovery.categories"}} {{i18n 'topic.browse_all_categories'}}{{/link-to}} {{i18n 'or'}} {{#link-to 'discovery.latest'}}{{i18n 'topic.view_latest_topics'}}{{/link-to}}
         </h3>
       {{/if}}
     {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/embedded_post.hbs b/app/assets/javascripts/discourse/templates/embedded_post.hbs
index 6deb81d0c..f620aeb8e 100644
--- a/app/assets/javascripts/discourse/templates/embedded_post.hbs
+++ b/app/assets/javascripts/discourse/templates/embedded_post.hbs
@@ -9,10 +9,10 @@
   <div class='topic-body'>
     <div class="topic-meta-data">
       {{poster-name post=this}}
-      {{#if view.parentView.previousPost}}<a href='{{unbound url}}' class="post-info arrow" title="{{i18n topic.jump_reply_up}}"><i class='fa fa-arrow-up'></i></a>{{/if}}
+      {{#if view.parentView.previousPost}}<a href='{{unbound url}}' class="post-info arrow" title="{{i18n 'topic.jump_reply_up'}}"><i class='fa fa-arrow-up'></i></a>{{/if}}
       <div class='post-info post-date'>{{age-with-tooltip created_at}}</div>
     </div>
     {{{unbound cooked}}}
-    {{#unless view.parentView.previousPost}}<a href='{{unbound url}}' class="arrow" title="{{i18n topic.jump_reply_down}}"><i class='fa fa-arrow-down'></i></a>{{/unless}}
+    {{#unless view.parentView.previousPost}}<a href='{{unbound url}}' class="arrow" title="{{i18n 'topic.jump_reply_down'}}"><i class='fa fa-arrow-down'></i></a>{{/unless}}
   </div>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/exception.hbs b/app/assets/javascripts/discourse/templates/exception.hbs
index ba19a38b8..e52073f2f 100644
--- a/app/assets/javascripts/discourse/templates/exception.hbs
+++ b/app/assets/javascripts/discourse/templates/exception.hbs
@@ -3,7 +3,7 @@
     <div class="face">:(</div>
     <div class="reason">{{reason}}</div>
     <div class="url">
-      {{i18n errors.prev_page}} <a {{bind-attr href=requestUrl}} data-auto-route="true">{{requestUrl}}</a>
+      {{i18n 'errors.prev_page'}} <a {{bind-attr href=requestUrl}} data-auto-route="true">{{requestUrl}}</a>
     </div>
     <div class="desc">
       {{#if networkFixed}}
diff --git a/app/assets/javascripts/discourse/templates/group.hbs b/app/assets/javascripts/discourse/templates/group.hbs
index d88ae8f12..f1af1a0ff 100644
--- a/app/assets/javascripts/discourse/templates/group.hbs
+++ b/app/assets/javascripts/discourse/templates/group.hbs
@@ -2,12 +2,12 @@
     <section class='user-navigation'>
       <ul class='action-list nav-stacked'>
         <li {{bind-attr class="showingIndex:active"}}>
-          {{#link-to 'group.index' model}}{{i18n groups.posts}}
+          {{#link-to 'group.index' model}}{{i18n 'groups.posts'}}
           <span class='count'>({{counts.posts}})</span>
           {{/link-to}}
         </li>
       <li {{bind-attr class="showingMembers:active"}}>
-        {{#link-to 'group.members' model}}{{i18n groups.members}}
+        {{#link-to 'group.members' model}}{{i18n 'groups.members'}}
         <span class='count'>({{counts.members}})</span>
         {{/link-to}}
       </li>
diff --git a/app/assets/javascripts/discourse/templates/group/members.hbs b/app/assets/javascripts/discourse/templates/group/members.hbs
index 2bafdd7ef..5a2fd360e 100644
--- a/app/assets/javascripts/discourse/templates/group/members.hbs
+++ b/app/assets/javascripts/discourse/templates/group/members.hbs
@@ -1,7 +1,7 @@
 {{#if model}}
   <table class='group-members'>
     <tr>
-      <th colspan="3" class="seen">{{i18n last_seen}}</th>
+      <th colspan="3" class="seen">{{i18n 'last_seen'}}</th>
     </tr>
   {{#each model}}
   <tr>
diff --git a/app/assets/javascripts/discourse/templates/header.hbs b/app/assets/javascripts/discourse/templates/header.hbs
index 4b8d59635..4b6e24034 100644
--- a/app/assets/javascripts/discourse/templates/header.hbs
+++ b/app/assets/javascripts/discourse/templates/header.hbs
@@ -7,17 +7,17 @@
       {{#unless currentUser}}
         {{#if showSignUpButton}}
         <button {{action "showCreateAccount"}} class='btn btn-primary btn-small sign-up-button'>
-          {{i18n sign_up}}
+          {{i18n 'sign_up'}}
         </button>
         {{/if}}
         <button {{action "showLogin"}} class='btn btn-primary btn-small login-button'>
-          {{fa-icon user}} {{i18n log_in}}
+          {{fa-icon user}} {{i18n 'log_in'}}
         </button>
       {{/unless}}
       <ul class='icons clearfix' role='navigation'>
         {{#if currentUser}}
           <li class='notifications'>
-            <a class='icon' href="#" {{action "showNotifications" target="view"}} data-notifications="notifications-dropdown" id='user-notifications' title='{{i18n notifications.title}}'>
+            <a class='icon' href="#" {{action "showNotifications" target="view"}} data-notifications="notifications-dropdown" id='user-notifications' title='{{i18n 'notifications.title'}}'>
               {{fa-icon comment label="notifications.title"}}
             </a>
             {{#if currentUser.unread_notifications}}
@@ -38,7 +38,7 @@
                class='icon expand'
                href='#'
                data-dropdown="search-dropdown"
-               title='{{i18n search.title}}'>
+               title='{{i18n 'search.title'}}'>
                {{fa-icon search label="search.title"}}
             </a>
           {{/if}}
@@ -57,13 +57,13 @@
                data-dropdown="site-map-dropdown"
                data-render="renderSiteMap"
                href="#"
-               title='{{i18n site_map}}'
+               title='{{i18n 'site_map'}}'
                id="site-map">
                {{fa-icon bars label="site_map"}}
             </a>
           {{/if}}
           {{#if currentUser.site_flagged_posts_count}}
-            <a href='/admin/flags/active' title='{{i18n notifications.total_flagged}}' class='badge-notification flagged-posts'>{{currentUser.site_flagged_posts_count}}</a>
+            <a href='/admin/flags/active' title='{{i18n 'notifications.total_flagged'}}' class='badge-notification flagged-posts'>{{currentUser.site_flagged_posts_count}}</a>
           {{/if}}
         </li>
         {{#if currentUser}}
@@ -72,7 +72,7 @@
                data-dropdown="user-dropdown"
                data-render="renderUserDropdown"
                href="#"
-               title='{{i18n user.avatar.title}}'
+               title='{{i18n 'user.avatar.title'}}'
                id="current-user">
                  {{bound-avatar currentUser "medium"}}
             </a>
@@ -115,7 +115,7 @@
                 {{#if topic.errorLoading}}
                   <span class="error">{{topic.errorTitle}}</span>
                 {{else}}
-                  <span class="loading">{{i18n topic.loading}}</span>
+                  <span class="loading">{{i18n 'topic.loading'}}</span>
                 {{/if}}
               {{/if}}
             </h1>
diff --git a/app/assets/javascripts/discourse/templates/list/topic-excerpt.raw.hbs b/app/assets/javascripts/discourse/templates/list/topic-excerpt.raw.hbs
index 94a3e629f..76be2c412 100644
--- a/app/assets/javascripts/discourse/templates/list/topic-excerpt.raw.hbs
+++ b/app/assets/javascripts/discourse/templates/list/topic-excerpt.raw.hbs
@@ -2,7 +2,7 @@
   <div class="topic-excerpt">
     {{{topic.excerpt}}}
     {{#if topic.excerptTruncated}}
-      <a href="{{topic.url}}">{{i18n read_more}}</a>
+      <a href="{{topic.url}}">{{i18n 'read_more'}}</a>
     {{/if}}
   </div>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/list/user_topics_list.hbs b/app/assets/javascripts/discourse/templates/list/user_topics_list.hbs
index b9c3de9e4..a63fc87f9 100644
--- a/app/assets/javascripts/discourse/templates/list/user_topics_list.hbs
+++ b/app/assets/javascripts/discourse/templates/list/user_topics_list.hbs
@@ -1,6 +1,6 @@
 {{#if showNewPM}}
   <div class="clearfix">
-    <a class='btn btn-primary pull-right new-private-message' {{action "composePrivateMessage"}}>{{fa-icon "envelope"}}{{i18n user.new_private_message}}</a>
+    <a class='btn btn-primary pull-right new-private-message' {{action "composePrivateMessage"}}>{{fa-icon "envelope"}}{{i18n 'user.new_private_message'}}</a>
   </div>
 {{/if}}
 
diff --git a/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs b/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs
index b98f6214d..74b5bc069 100644
--- a/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs
@@ -17,10 +17,10 @@
                 <div class="topic-excerpt">
                   {{excerpt}}
                   {{#if excerptTruncated}}
-                    {{#unless canClearPin}}<a href="{{url}}">{{i18n read_more}}</a>{{/unless}}
+                    {{#unless canClearPin}}<a href="{{url}}">{{i18n 'read_more'}}</a>{{/unless}}
                   {{/if}}
                   {{#if canClearPin}}
-                    <a href="#" {{action "clearPin" this}} title="{{i18n topic.clear_pin.help}}">{{i18n topic.clear_pin.title}}</a>
+                    <a href="#" {{action "clearPin" this}} title="{{i18n 'topic.clear_pin.help'}}">{{i18n 'topic.clear_pin.title'}}</a>
                   {{/if}}
                 </div>
             {{/if}}
@@ -51,7 +51,7 @@
       </table>
     {{else}}
       <div class='alert alert-info'>
-        {{i18n choose_topic.none_found}}
+        {{i18n 'choose_topic.none_found'}}
     </div>
   {{/if}}
 {{/loading-spinner}}
diff --git a/app/assets/javascripts/discourse/templates/mobile/discovery/categories.hbs b/app/assets/javascripts/discourse/templates/mobile/discovery/categories.hbs
index cbe47e169..789368925 100644
--- a/app/assets/javascripts/discourse/templates/mobile/discovery/categories.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/discovery/categories.hbs
@@ -27,10 +27,10 @@
                 <div class="topic-excerpt">
                   {{{excerpt}}}
                   {{#if excerptTruncated}}
-                  {{#unless canClearPin}}<a href="{{unbound url}}">{{i18n read_more}}</a>{{/unless}}
+                  {{#unless canClearPin}}<a href="{{unbound url}}">{{i18n 'read_more'}}</a>{{/unless}}
                   {{/if}}
                   {{#if canClearPin}}
-                    <a href="#" {{action "clearPin" this}} title="{{unbound i18n topic.clear_pin.help}}">{{i18n topic.clear_pin.title}}</a>
+                    <a href="#" {{action "clearPin" this}} title="{{unbound i18n topic.clear_pin.help}}">{{i18n 'topic.clear_pin.title'}}</a>
                   {{/if}}
                 </div>
               {{/if}}
@@ -55,12 +55,12 @@
 
     </table>
     <footer class="clearfix">
-      <figure title="{{i18n year_desc}}">{{number topics_year}} <figcaption>{{i18n category.this_year}}</figcaption></figure>
-      <figure title="{{i18n month_desc}}">{{number topics_month}} <figcaption>{{i18n month}}</figcaption></figure>
-      <figure title="{{i18n week_desc}}">{{number topics_week}} <figcaption>{{i18n week}}</figcaption></figure>
+      <figure title="{{i18n 'year_desc'}}">{{number topics_year}} <figcaption>{{i18n 'category.this_year'}}</figcaption></figure>
+      <figure title="{{i18n 'month_desc'}}">{{number topics_month}} <figcaption>{{i18n 'month'}}</figcaption></figure>
+      <figure title="{{i18n 'week_desc'}}">{{number topics_week}} <figcaption>{{i18n 'week'}}</figcaption></figure>
 
       {{#if controller.canEdit}}
-        <a href='#' {{action "editCategory" this}} class='btn btn-small'>{{i18n category.edit}}</a>
+        <a href='#' {{action "editCategory" this}} class='btn btn-small'>{{i18n 'category.edit'}}</a>
       {{/if}}
 
     </footer>
diff --git a/app/assets/javascripts/discourse/templates/mobile/discovery/topics.hbs b/app/assets/javascripts/discourse/templates/mobile/discovery/topics.hbs
index 10f7529a1..59940fdaa 100644
--- a/app/assets/javascripts/discourse/templates/mobile/discovery/topics.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/discovery/topics.hbs
@@ -12,7 +12,7 @@
             <td>
               <div class='alert alert-info' {{action "showInserted"}}>
                 {{countI18n topic_count_ suffix=topicTrackingState.filter count=topicTrackingState.incomingCount}}
-                {{i18n click_to_show}}
+                {{i18n 'click_to_show'}}
               </div>
             </td>
           </tr>
@@ -27,11 +27,11 @@
   {{loading-spinner condition=loadingMore}}
   {{#if allLoaded}}
     {{#if showDismissRead}}
-      <button title="{{i18n topics.bulk.dismiss_topics_tooltip}}" id='dismiss-topics' class='btn dismiss-read' {{action "dismissRead" "topics"}}>{{i18n topics.bulk.dismiss_topics}}</button>
-      <button title="{{i18n topics.bulk.dismiss_posts_tooltip}}" id='dismiss-posts' class='btn dismiss-read' {{action "dismissRead" "posts"}}>{{i18n topics.bulk.dismiss_posts}}</button>
+      <button title="{{i18n 'topics.bulk.dismiss_topics_tooltip'}}" id='dismiss-topics' class='btn dismiss-read' {{action "dismissRead" "topics"}}>{{i18n 'topics.bulk.dismiss_topics'}}</button>
+      <button title="{{i18n 'topics.bulk.dismiss_posts_tooltip'}}" id='dismiss-posts' class='btn dismiss-read' {{action "dismissRead" "posts"}}>{{i18n 'topics.bulk.dismiss_posts'}}</button>
     {{/if}}
     {{#if showResetNew}}
-      <button id='dismiss-new' class='btn dismiss-read' {{action "resetNew"}}>{{i18n topics.bulk.dismiss_new}}</button>
+      <button id='dismiss-new' class='btn dismiss-read' {{action "resetNew"}}>{{i18n 'topics.bulk.dismiss_new'}}</button>
     {{/if}}
 
     {{#if latest}}
@@ -40,12 +40,12 @@
       </div>
       <h3>
         {{footerMessage}}
-        {{#if can_create_topic}}<a href='#' {{action "createTopic"}}>{{i18n topic.suggest_create_topic}}</a>{{/if}}
+        {{#if can_create_topic}}<a href='#' {{action "createTopic"}}>{{i18n 'topic.suggest_create_topic'}}</a>{{/if}}
       </h3>
     {{else}}
       {{#if top}}
         <h3>
-          {{#link-to "discovery.categories"}}{{i18n topic.browse_all_categories}}{{/link-to}}, {{#link-to 'discovery.latest'}}{{i18n topic.view_latest_topics}}{{/link-to}} {{i18n or}} {{i18n filters.top.other_periods}}
+          {{#link-to "discovery.categories"}}{{i18n 'topic.browse_all_categories'}}{{/link-to}}, {{#link-to 'discovery.latest'}}{{i18n 'topic.view_latest_topics'}}{{/link-to}} {{i18n 'or'}} {{i18n 'filters.top.other_periods'}}
           <br/>
           {{top-period-buttons period=period}}
         </h3>
@@ -54,7 +54,7 @@
             {{{footerEducation}}}
         </div>
         <h3>
-          {{footerMessage}}{{#link-to "discovery.categories"}} {{i18n topic.browse_all_categories}}{{/link-to}} {{i18n or}} {{#link-to 'discovery.latest'}}{{i18n topic.view_latest_topics}}{{/link-to}}
+          {{footerMessage}}{{#link-to "discovery.categories"}} {{i18n 'topic.browse_all_categories'}}{{/link-to}} {{i18n 'or'}} {{#link-to 'discovery.latest'}}{{i18n 'topic.view_latest_topics'}}{{/link-to}}
         </h3>
       {{/if}}
     {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/mobile/list/topic_list_item.hbs b/app/assets/javascripts/discourse/templates/mobile/list/topic_list_item.hbs
index cbcbec969..5db0015b9 100644
--- a/app/assets/javascripts/discourse/templates/mobile/list/topic_list_item.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/list/topic_list_item.hbs
@@ -11,10 +11,10 @@
     <div class="topic-excerpt">
       {{{excerpt}}}
       {{#if excerptTruncated}}
-        {{#unless canClearPin}}<a href="{{url}}">{{i18n read_more}}</a>{{/unless}}
+        {{#unless canClearPin}}<a href="{{url}}">{{i18n 'read_more'}}</a>{{/unless}}
       {{/if}}
       {{#if canClearPin}}
-        <a href="#" {{action "clearPin" this}} title="{{i18n topic.clear_pin.help}}">{{i18n topic.clear_pin.title}}</a>
+        <a href="#" {{action "clearPin" this}} title="{{i18n 'topic.clear_pin.help'}}">{{i18n 'topic.clear_pin.title'}}</a>
       {{/if}}
     </div>
   {{/if}}
@@ -30,7 +30,7 @@
   <div class="pull-right">
     {{posts-count-column topic=this tagName="div" class="num posts" action="showTopicEntrance"}}
     <div class='num activity last'>
-      <a href="{{lastPostUrl}}" title='{{i18n last_post}}: {{{raw-date bumped_at}}}'>{{last_poster_username}}</a>
+      <a href="{{lastPostUrl}}" title='{{i18n 'last_post'}}: {{{raw-date bumped_at}}}'>{{last_poster_username}}</a>
       {{raw "list/activity-column" topic=this tagName="span" class="age"}}
     </div>
   </div>
diff --git a/app/assets/javascripts/discourse/templates/mobile/modal/login.hbs b/app/assets/javascripts/discourse/templates/mobile/modal/login.hbs
index 806ffd654..c3db1acaf 100644
--- a/app/assets/javascripts/discourse/templates/mobile/modal/login.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/modal/login.hbs
@@ -6,7 +6,7 @@
         <table>
           <tr>
             <td>
-              <label for='login-account-name'>{{i18n login.username}}&nbsp;</label>
+              <label for='login-account-name'>{{i18n 'login.username'}}&nbsp;</label>
             </td>
             <td>
               {{text-field value=loginName placeholderKey="login.email_placeholder" id="login-account-name" autocorrect="off" autocapitalize="off"}}
@@ -14,7 +14,7 @@
           </tr>
           <tr>
             <td>
-                <label for='login-account-password'>{{i18n login.password}}&nbsp;</label>
+                <label for='login-account-password'>{{i18n 'login.password'}}&nbsp;</label>
             </td>
             <td>
                 {{text-field value=loginPassword type="password" id="login-account-password" maxlength="200"}} &nbsp;
@@ -23,7 +23,7 @@
           <tr>
             <td></td>
             <td>
-              <a id="forgot-password-link" {{action "showForgotPassword"}}>{{i18n forgot_password.action}}</a>
+              <a id="forgot-password-link" {{action "showForgotPassword"}}>{{i18n 'forgot_password.action'}}</a>
             </td>
           </tr>
         </table>
@@ -35,7 +35,7 @@
 </div>
 <div class="modal-footer">
   {{#if authenticate}}
-    {{i18n login.authenticating}}
+    {{i18n 'login.authenticating'}}
   {{/if}}
   {{#if canLoginLocal}}
     <button class='btn btn-large btn-primary'
@@ -46,7 +46,7 @@
 
     {{#if showSignupLink}}
       <button class="btn btn-large" id="new-account-link" {{action "showCreateAccount"}}>
-        {{i18n create_account.title}}
+        {{i18n 'create_account.title'}}
       </button>
     {{/if}}
   {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/modal/archetype_options.hbs b/app/assets/javascripts/discourse/templates/modal/archetype_options.hbs
index 2d46cf539..d8c949d9b 100644
--- a/app/assets/javascripts/discourse/templates/modal/archetype_options.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/archetype_options.hbs
@@ -4,5 +4,5 @@
   </form>
 </div>
 <div class="modal-footer">
-  <button class='btn btn-primary' {{action "closeModal"}}>{{i18n post.archetypes.save}}</button>
+  <button class='btn btn-primary' {{action "closeModal"}}>{{i18n 'post.archetypes.save'}}</button>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/modal/auto_close.hbs b/app/assets/javascripts/discourse/templates/modal/auto_close.hbs
index 0c037bfb8..8c0cd9e64 100644
--- a/app/assets/javascripts/discourse/templates/modal/auto_close.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/auto_close.hbs
@@ -6,8 +6,8 @@
                       limited=details.auto_close_based_on_last_post }}
   </div>
   <div class="modal-footer">
-    <button class='btn btn-primary' type='submit' {{bind-attr disabled="auto_close_invalid"}}>{{i18n topic.auto_close_save}}</button>
-    <a {{action "closeModal"}}>{{i18n cancel}}</a>
-    <button class='btn pull-right' {{action "removeAutoClose"}}>{{i18n topic.auto_close_remove}}</button>
+    <button class='btn btn-primary' type='submit' {{bind-attr disabled="auto_close_invalid"}}>{{i18n 'topic.auto_close_save'}}</button>
+    <a {{action "closeModal"}}>{{i18n 'cancel'}}</a>
+    <button class='btn pull-right' {{action "removeAutoClose"}}>{{i18n 'topic.auto_close_remove'}}</button>
   </div>
 </form>
diff --git a/app/assets/javascripts/discourse/templates/modal/avatar_selector.hbs b/app/assets/javascripts/discourse/templates/modal/avatar_selector.hbs
index cb459c927..de3ca91c5 100644
--- a/app/assets/javascripts/discourse/templates/modal/avatar_selector.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/avatar_selector.hbs
@@ -2,12 +2,12 @@
   <div>
     <div>
       <input type="radio" id="system-avatar" name="avatar" value="system" {{action "useSystem"}}>
-      <label class="radio" for="system-avatar">{{bound-avatar controller "large" system_avatar_upload_id}} {{{i18n user.change_avatar.letter_based}}}</label>
+      <label class="radio" for="system-avatar">{{bound-avatar controller "large" system_avatar_upload_id}} {{{i18n 'user.change_avatar.letter_based'}}}</label>
     </div>
     <div>
       <input type="radio" id="gravatar" name="avatar" value="gravatar" {{action "useGravatar"}}>
-      <label class="radio" for="gravatar">{{bound-avatar controller "large" gravatar_avatar_upload_id}} {{{i18n user.change_avatar.gravatar}}} {{email}}</label>
-      <button href {{action "refreshGravatar"}} title="{{i18n user.change_avatar.refresh_gravatar_title}}" {{bind-attr enabled="view.gravatarRefreshEnabled"}} class="btn no-text"><i class="fa fa-refresh"></i></button>
+      <label class="radio" for="gravatar">{{bound-avatar controller "large" gravatar_avatar_upload_id}} {{{i18n 'user.change_avatar.gravatar'}}} {{email}}</label>
+      <button href {{action "refreshGravatar"}} title="{{i18n 'user.change_avatar.refresh_gravatar_title'}}" {{bind-attr enabled="view.gravatarRefreshEnabled"}} class="btn no-text"><i class="fa fa-refresh"></i></button>
     </div>
     <div>
       <input type="radio" id="uploaded_avatar" name="avatar" value="uploaded" {{action "useUploadedAvatar"}}>
@@ -16,10 +16,10 @@
           {{#if view.uploadedAvatarTemplate}}
             {{bound-avatar-template view.uploadedAvatarTemplate "large"}}
           {{else}}
-            {{bound-avatar controller "large" custom_avatar_upload_id}} {{i18n user.change_avatar.uploaded_avatar}}
+            {{bound-avatar controller "large" custom_avatar_upload_id}} {{i18n 'user.change_avatar.uploaded_avatar'}}
           {{/if}}
         {{else}}
-          {{i18n user.change_avatar.uploaded_avatar_empty}}
+          {{i18n 'user.change_avatar.uploaded_avatar_empty'}}
         {{/if}}
       </label>
       {{avatar-uploader username=username
@@ -30,6 +30,6 @@
 </div>
 
 <div class="modal-footer">
-  <button class="btn btn-primary" {{action "saveAvatarSelection"}} {{bind-attr disabled="view.saveDisabled"}}>{{i18n save}}</button>
-  <a {{action "closeModal"}}>{{i18n cancel}}</a>
+  <button class="btn btn-primary" {{action "saveAvatarSelection"}} {{bind-attr disabled="view.saveDisabled"}}>{{i18n 'save'}}</button>
+  <a {{action "closeModal"}}>{{i18n 'cancel'}}</a>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/modal/bulk_actions_buttons.hbs b/app/assets/javascripts/discourse/templates/modal/bulk_actions_buttons.hbs
index 3301aa6af..40ace4bc3 100644
--- a/app/assets/javascripts/discourse/templates/modal/bulk_actions_buttons.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/bulk_actions_buttons.hbs
@@ -1,10 +1,10 @@
 <p>
-  <button class='btn' {{action "showChangeCategory"}}>{{i18n topics.bulk.change_category}}</button>
-  <button class='btn' {{action "deleteTopics"}}>{{i18n topics.bulk.delete}}</button>
-  <button class='btn' {{action "closeTopics"}}>{{i18n topics.bulk.close_topics}}</button>
-  <button class='btn' {{action "archiveTopics"}}>{{i18n topics.bulk.archive_topics}}</button>
+  <button class='btn' {{action "showChangeCategory"}}>{{i18n 'topics.bulk.change_category'}}</button>
+  <button class='btn' {{action "deleteTopics"}}>{{i18n 'topics.bulk.delete'}}</button>
+  <button class='btn' {{action "closeTopics"}}>{{i18n 'topics.bulk.close_topics'}}</button>
+  <button class='btn' {{action "archiveTopics"}}>{{i18n 'topics.bulk.archive_topics'}}</button>
 </p>
 <p>
-  <button class='btn' {{action "showNotificationLevel"}}>{{i18n topics.bulk.notification_level}}</button>
-  <button class='btn' {{action "resetRead"}}>{{i18n topics.bulk.reset_read}}</button>
+  <button class='btn' {{action "showNotificationLevel"}}>{{i18n 'topics.bulk.notification_level'}}</button>
+  <button class='btn' {{action "resetRead"}}>{{i18n 'topics.bulk.reset_read'}}</button>
 </p>
diff --git a/app/assets/javascripts/discourse/templates/modal/bulk_change_category.hbs b/app/assets/javascripts/discourse/templates/modal/bulk_change_category.hbs
index 4861aa42b..e67173ff7 100644
--- a/app/assets/javascripts/discourse/templates/modal/bulk_change_category.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/bulk_change_category.hbs
@@ -3,7 +3,7 @@
 <p>{{category-chooser value=newCategoryId}}</p>
 
 {{#if loading}}
-  <div class='loading'>{{i18n loading}}</div>
+  <div class='loading'>{{i18n 'loading'}}</div>
 {{else}}
   <button class='btn' {{action "changeCategory"}}>Change Category</button>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/modal/bulk_notification_level.hbs b/app/assets/javascripts/discourse/templates/modal/bulk_notification_level.hbs
index 4e37543db..cb40e1802 100644
--- a/app/assets/javascripts/discourse/templates/modal/bulk_notification_level.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/bulk_notification_level.hbs
@@ -7,4 +7,4 @@
   </div>
 {{/each}}
 
-<button class='btn' {{bind-attr disabled="disabled"}} {{action "changeNotificationLevel"}}>{{i18n topics.bulk.notification_level}}</button>
+<button class='btn' {{bind-attr disabled="disabled"}} {{action "changeNotificationLevel"}}>{{i18n 'topics.bulk.notification_level'}}</button>
diff --git a/app/assets/javascripts/discourse/templates/modal/change_owner.hbs b/app/assets/javascripts/discourse/templates/modal/change_owner.hbs
index e8cc1c2ee..7b7f2406a 100644
--- a/app/assets/javascripts/discourse/templates/modal/change_owner.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/change_owner.hbs
@@ -1,11 +1,11 @@
 <div class="modal-body">
-  {{{i18n topic.change_owner.instructions count="selectedPostsCount" old_user="selectedPostsUsername"}}}
+  {{{i18n 'topic.change_owner.instructions' count="selectedPostsCount" old_user="selectedPostsUsername"}}}
   <p>
-      {{{i18n topic.change_owner.instructions_warn}}}
+      {{{i18n 'topic.change_owner.instructions_warn'}}}
   </p>
 
   <form>
-      <label>{{i18n topic.change_owner.label}}</label>
+      <label>{{i18n 'topic.change_owner.label'}}</label>
     {{user-selector single=true usernames=new_user include_groups="false" placeholderKey="topic.change_owner.placeholder"}}
   </form>
 
diff --git a/app/assets/javascripts/discourse/templates/modal/create-account.hbs b/app/assets/javascripts/discourse/templates/modal/create-account.hbs
index 2faa73d77..d51d8ea6a 100644
--- a/app/assets/javascripts/discourse/templates/modal/create-account.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/create-account.hbs
@@ -10,7 +10,7 @@
         <table>
 
         <tr class="input">
-              <td class="label"><label for='new-account-email'>{{i18n user.email.title}}</label></td>
+              <td class="label"><label for='new-account-email'>{{i18n 'user.email.title'}}</label></td>
               <td>
               {{input type="email" value=accountEmail id="new-account-email" disabled=emailValidated name="email" autofocus="autofocus"}}
               &nbsp;{{input-tip validation=emailValidation}}
@@ -18,11 +18,11 @@
         </tr>
         <tr class="instructions">
           <td></td>
-          <td><label>{{i18n user.email.instructions}}</label></td>
+          <td><label>{{i18n 'user.email.instructions'}}</label></td>
         </tr>
 
         <tr class="input">
-              <td class="label"><label for='new-account-username'>{{i18n user.username.title}}</label></td>
+              <td class="label"><label for='new-account-username'>{{i18n 'user.username.title'}}</label></td>
               <td>
               {{input value=accountUsername id="new-account-username" name="username" maxlength=maxUsernameLength}}
               &nbsp;{{input-tip validation=usernameValidation id="username-validation"}}
@@ -30,11 +30,11 @@
         </tr>
         <tr class="instructions">
           <td></td>
-          <td><label>{{i18n user.username.instructions}}</label></td>
+          <td><label>{{i18n 'user.username.instructions'}}</label></td>
         </tr>
 
         <tr class="input">
-            <td style="width:80px" class="label"><label for='new-account-name'>{{i18n user.name.title}}</label></td>
+            <td style="width:80px" class="label"><label for='new-account-name'>{{i18n 'user.name.title'}}</label></td>
             <td style="width:496px">
                 {{text-field value=accountName id="new-account-name"}}
                 &nbsp;{{input-tip validation=nameValidation}}
@@ -42,12 +42,12 @@
         </tr>
         <tr class="instructions">
             <td></td>
-            <td><label>{{i18n user.name.instructions}}</label></td>
+            <td><label>{{i18n 'user.name.instructions'}}</label></td>
         </tr>
 
         {{#if passwordRequired}}
         <tr class="input">
-            <td class="label"><label for='new-account-password'>{{i18n user.password.title}}</label></td>
+            <td class="label"><label for='new-account-password'>{{i18n 'user.password.title'}}</label></td>
             <td>
             {{password-field value=accountPassword type="password" id="new-account-password" capsLockOn=capsLockOn}}
             &nbsp;{{input-tip validation=passwordValidation}}
@@ -57,13 +57,13 @@
           <td></td>
           <td>
             <label>{{passwordInstructions}}</label>
-            <div {{bind-attr class=":caps-lock-warning capsLockOn::invisible"}}><i class="fa fa-exclamation-triangle"></i> {{i18n login.caps_lock_warning}}</div>
+            <div {{bind-attr class=":caps-lock-warning capsLockOn::invisible"}}><i class="fa fa-exclamation-triangle"></i> {{i18n 'login.caps_lock_warning'}}</div>
           </td>
         </tr>
         {{/if}}
 
         <tr class="password-confirmation">
-          <td><label for='new-account-password-confirmation'>{{i18n user.password_confirmation.title}}</label></td>
+          <td><label for='new-account-password-confirmation'>{{i18n 'user.password_confirmation.title'}}</label></td>
           <td>
             {{input type="password" value=accountPasswordConfirm id="new-account-confirmation"}}
             {{input value=accountChallenge id="new-account-challenge"}}
@@ -87,10 +87,10 @@
 
   {{#if showCreateForm}}
     <div class="modal-footer">
-      <button class='btn btn-large btn-primary' {{bind-attr disabled="submitDisabled"}} {{action "createAccount"}}>{{i18n create_account.title}}</button>
+      <button class='btn btn-large btn-primary' {{bind-attr disabled="submitDisabled"}} {{action "createAccount"}}>{{i18n 'create_account.title'}}</button>
       {{#loading-spinner condition=formSubmitted size="small"}}
         <button class="btn btn-large" id="login-link" {{action "showLogin"}}>
-          {{i18n log_in}}
+          {{i18n 'log_in'}}
         </button>
       {{/loading-spinner}}
     </div>
diff --git a/app/assets/javascripts/discourse/templates/modal/edit-category-general.hbs b/app/assets/javascripts/discourse/templates/modal/edit-category-general.hbs
index 69232f908..f1a5ebd60 100644
--- a/app/assets/javascripts/discourse/templates/modal/edit-category-general.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/edit-category-general.hbs
@@ -1,18 +1,18 @@
 <form>
   <section class='field'>
-    <label>{{i18n category.name}}</label>
+    <label>{{i18n 'category.name'}}</label>
     {{text-field value=name placeholderKey="category.name_placeholder" maxlength="50"}}
   </section>
 
   {{#if canSelectParentCategory}}
     <section class='field'>
       {{#if subCategories}}
-        <label>{{i18n categories.subcategories}}</label>
+        <label>{{i18n 'categories.subcategories'}}</label>
         {{#each subCategories}}
           {{category-badge this}}
         {{/each}}
       {{else}}
-        <label>{{i18n category.parent}}</label>
+        <label>{{i18n 'category.parent'}}</label>
         {{category-chooser valueAttribute="id" value=parent_category_id categories=parentCategories rootNone=true}}
       {{/if}}
     </section>
@@ -20,33 +20,33 @@
 
   {{#if showDescription}}
     <section class='field'>
-      <label>{{i18n category.description}}</label>
+      <label>{{i18n 'category.description'}}</label>
 
       {{#if description}}
         {{description}}
       {{else}}
-        {{i18n category.no_description}}
+        {{i18n 'category.no_description'}}
       {{/if}}
       {{#if topic_url}}
         <br/>
-        <button class="btn btn-small" {{action "showCategoryTopic"}}><i class="fa fa-pencil"></i>{{i18n category.change_in_category_topic}}</button>
+        <button class="btn btn-small" {{action "showCategoryTopic"}}><i class="fa fa-pencil"></i>{{i18n 'category.change_in_category_topic'}}</button>
       {{/if}}
     </section>
   {{/if}}
 
   <section class='field'>
-    <label>{{i18n category.badge_colors}}</label>
+    <label>{{i18n 'category.badge_colors'}}</label>
     <div class="category-color-editor">
       {{{categoryBadgePreview}}}
 
       <div class='input-prepend input-append' style="margin-top: 10px;">
-        <span class='color-title'>{{i18n category.background_color}}:</span>
+        <span class='color-title'>{{i18n 'category.background_color'}}:</span>
         <span class='add-on'>#</span>{{text-field value=color placeholderKey="category.color_placeholder" maxlength="6"}}
         {{color-picker colors=backgroundColors usedColors=usedBackgroundColors value=color}}
       </div>
 
       <div class='input-prepend input-append'>
-        <span class='color-title'>{{i18n category.foreground_color}}:</span>
+        <span class='color-title'>{{i18n 'category.foreground_color'}}:</span>
         <span class='add-on'>#</span>{{text-field value=text_color placeholderKey="category.color_placeholder" maxlength="6"}}
         {{color-picker colors=foregroundColors value=text_color}}
       </div>
diff --git a/app/assets/javascripts/discourse/templates/modal/edit-category-images.hbs b/app/assets/javascripts/discourse/templates/modal/edit-category-images.hbs
index 73fd9cf8f..e1bacab39 100644
--- a/app/assets/javascripts/discourse/templates/modal/edit-category-images.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/edit-category-images.hbs
@@ -1,9 +1,9 @@
 <section class='field'>
-  <label>{{i18n category.logo}}</label>
+  <label>{{i18n 'category.logo'}}</label>
   {{image-uploader uploadUrl=categoryUploadUrl imageUrl=logo_url type="logo"}}
 </section>
 
 <section class='field'>
-  <label>{{i18n category.background_image}}</label>
+  <label>{{i18n 'category.background_image'}}</label>
   {{image-uploader uploadUrl=categoryUploadUrl imageUrl=background_url type="background"}}
 </section>
diff --git a/app/assets/javascripts/discourse/templates/modal/edit-category-security.hbs b/app/assets/javascripts/discourse/templates/modal/edit-category-security.hbs
index 8291af749..0b45f2055 100644
--- a/app/assets/javascripts/discourse/templates/modal/edit-category-security.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/edit-category-security.hbs
@@ -14,8 +14,8 @@
   {{#if controller.editingPermissions}}
     {{view Ember.Select content=availableGroups value=selectedGroup}}
     {{view Ember.Select class="permission-selector" optionValuePath="content.id" optionLabelPath="content.description" content=availablePermissions value=selectedPermission}}
-    <button {{action "addPermission" selectedGroup selectedPermission}} class="btn btn-small">{{i18n category.add_permission}}</button>
+    <button {{action "addPermission" selectedGroup selectedPermission}} class="btn btn-small">{{i18n 'category.add_permission'}}</button>
   {{else}}
-    <button {{action "editPermissions"}} class="btn btn-small">{{i18n category.edit_permissions}}</button>
+    <button {{action "editPermissions"}} class="btn btn-small">{{i18n 'category.edit_permissions'}}</button>
   {{/if}}
 </section>
diff --git a/app/assets/javascripts/discourse/templates/modal/edit-category-settings.hbs b/app/assets/javascripts/discourse/templates/modal/edit-category-settings.hbs
index f31d4699f..618742f62 100644
--- a/app/assets/javascripts/discourse/templates/modal/edit-category-settings.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/edit-category-settings.hbs
@@ -8,7 +8,7 @@
   <div class="allow-badges">
     <div>
       {{input type="checkbox" checked=allow_badges}}
-      {{i18n category.allow_badges_label}}
+      {{i18n 'category.allow_badges_label'}}
     </div>
   </div>
 </section>
@@ -18,28 +18,28 @@
     {{#if emailInEnabled}}
       <div>
         <i class="fa fa-envelope-o"></i>
-        {{i18n category.email_in}}
+        {{i18n 'category.email_in'}}
         {{text-field value=email_in}}
       </div>
       <div>
         <label class="checkbox-label">
           {{input type="checkbox" checked=email_in_allow_strangers}}
-          {{i18n category.email_in_allow_strangers}}
+          {{i18n 'category.email_in_allow_strangers'}}
         </label>
       </div>
     {{else}}
-      {{i18n category.email_in_disabled}}
-      <a href="/admin/site_settings/category/email">{{i18n category.email_in_disabled_click}}</a>
+      {{i18n 'category.email_in_disabled'}}
+      <a href="/admin/site_settings/category/email">{{i18n 'category.email_in_disabled_click'}}</a>
     {{/if}}
   </div>
 </section>
 
 <section class='field'>
   {{#if showPositionInput}}
-    <label>{{i18n category.position}}</label>
+    <label>{{i18n 'category.position'}}</label>
     {{text-field value=position class="position-input"}}
   {{else}}
-    {{i18n category.position_disabled}}
-    <a href="/admin/site_settings/category/basic">{{i18n category.position_disabled_click}}</a>
+    {{i18n 'category.position_disabled'}}
+    <a href="/admin/site_settings/category/basic">{{i18n 'category.position_disabled_click'}}</a>
   {{/if}}
 </section>
diff --git a/app/assets/javascripts/discourse/templates/modal/flag.hbs b/app/assets/javascripts/discourse/templates/modal/flag.hbs
index 33adba35a..cb2c08aba 100644
--- a/app/assets/javascripts/discourse/templates/modal/flag.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/flag.hbs
@@ -15,20 +15,20 @@
         {{/if}}
       </div>
     {{else}}
-      {{i18n flagging.cant}}
+      {{i18n 'flagging.cant'}}
     {{/each}}
   </form>
 
 </div>
 <div class="modal-footer">
-  <button class='btn btn-primary' {{action "createFlag"}} {{bind-attr disabled="submitDisabled"}} title="{{i18n flagging.submit_tooltip}}">{{{submitText}}}</button>
+  <button class='btn btn-primary' {{action "createFlag"}} {{bind-attr disabled="submitDisabled"}} title="{{i18n 'flagging.submit_tooltip'}}">{{{submitText}}}</button>
 
   {{#if canTakeAction}}
-    <button class='btn btn-danger' {{action "takeAction"}} {{bind-attr disabled="submitDisabled"}} title="{{i18n flagging.take_action_tooltip}}"><i class="fa fa-gavel"></i>{{i18n flagging.take_action}}</button>
+    <button class='btn btn-danger' {{action "takeAction"}} {{bind-attr disabled="submitDisabled"}} title="{{i18n 'flagging.take_action_tooltip'}}"><i class="fa fa-gavel"></i>{{i18n 'flagging.take_action'}}</button>
   {{/if}}
 
   {{#if canDeleteSpammer}}
-    <button class="btn btn-danger" {{action "deleteSpammer" userDetails}} {{bind-attr disabled="submitDisabled"}} title="{{i18n flagging.delete_spammer}}"><i class="fa fa-exclamation-triangle"></i> {{i18n flagging.delete_spammer}}</button>
+    <button class="btn btn-danger" {{action "deleteSpammer" userDetails}} {{bind-attr disabled="submitDisabled"}} title="{{i18n 'flagging.delete_spammer'}}"><i class="fa fa-exclamation-triangle"></i> {{i18n 'flagging.delete_spammer'}}</button>
   {{/if}}
-  <span class="hint">{{{i18n flagging.private_reminder}}}</span>
+  <span class="hint">{{{i18n 'flagging.private_reminder'}}}</span>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/modal/forgot_password.hbs b/app/assets/javascripts/discourse/templates/modal/forgot_password.hbs
index 13c4ae09a..2d5e39f8c 100644
--- a/app/assets/javascripts/discourse/templates/modal/forgot_password.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/forgot_password.hbs
@@ -1,9 +1,9 @@
 <form>
     <div class="modal-body">
-      <label for='username-or-email'>{{i18n forgot_password.invite}}</label>
+      <label for='username-or-email'>{{i18n 'forgot_password.invite'}}</label>
       {{text-field value=accountEmailOrUsername placeholderKey="login.email_placeholder" id="username-or-email" autocorrect="off" autocapitalize="off"}}
     </div>
     <div class="modal-footer">
-      <button class='btn btn-large btn-primary' {{bind-attr disabled="submitDisabled"}} {{action "submit"}}>{{i18n forgot_password.reset}}</button>
+      <button class='btn btn-large btn-primary' {{bind-attr disabled="submitDisabled"}} {{action "submit"}}>{{i18n 'forgot_password.reset'}}</button>
     </div>
 </form>
diff --git a/app/assets/javascripts/discourse/templates/modal/history.hbs b/app/assets/javascripts/discourse/templates/modal/history.hbs
index 9b9b52da5..97f648034 100644
--- a/app/assets/javascripts/discourse/templates/modal/history.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/history.hbs
@@ -1,32 +1,32 @@
 <div class="modal-body">
   <div>
     <div id="revision-controls">
-      <button title="{{i18n post.revisions.controls.first}}" {{bind-attr class=":btn :standard :no-text displayGoToFirst::invisible" disabled=loading}} {{action "loadFirstVersion"}}><i class="fa fa-fast-backward"></i></button>
-      <button title="{{i18n post.revisions.controls.previous}}" {{bind-attr class=":btn :standard :no-text displayGoToPrevious::invisible" disabled=loading}} {{action "loadPreviousVersion"}}><i class="fa fa-backward"></i></button>
+      <button title="{{i18n 'post.revisions.controls.first'}}" {{bind-attr class=":btn :standard :no-text displayGoToFirst::invisible" disabled=loading}} {{action "loadFirstVersion"}}><i class="fa fa-fast-backward"></i></button>
+      <button title="{{i18n 'post.revisions.controls.previous'}}" {{bind-attr class=":btn :standard :no-text displayGoToPrevious::invisible" disabled=loading}} {{action "loadPreviousVersion"}}><i class="fa fa-backward"></i></button>
       <div id="revision-numbers" {{bind-attr class="displayRevisions::invisible"}}>
         {{#loading-spinner condition=loading size="small"}}
           {{boundI18n revisionsTextKey previousBinding="previousVersion" currentBinding="current_version" totalBinding="version_count"}}
         {{/loading-spinner}}
       </div>
-      <button title="{{i18n post.revisions.controls.next}}" {{bind-attr class=":btn :standard :no-text displayGoToNext::invisible" disabled=loading}} {{action "loadNextVersion"}}><i class="fa fa-forward"></i></button>
-      <button title="{{i18n post.revisions.controls.last}}" {{bind-attr class=":btn :standard :no-text displayGoToLast::invisible" disabled=loading}} {{action "loadLastVersion"}}><i class="fa fa-fast-forward"></i></button>
+      <button title="{{i18n 'post.revisions.controls.next'}}" {{bind-attr class=":btn :standard :no-text displayGoToNext::invisible" disabled=loading}} {{action "loadNextVersion"}}><i class="fa fa-forward"></i></button>
+      <button title="{{i18n 'post.revisions.controls.last'}}" {{bind-attr class=":btn :standard :no-text displayGoToLast::invisible" disabled=loading}} {{action "loadLastVersion"}}><i class="fa fa-fast-forward"></i></button>
       {{#if displayHide}}
-        <button title="{{i18n post.revisions.controls.hide}}" {{bind-attr class=":btn :standard :no-text :btn-danger" disabled=loading}} {{action "hideVersion"}}><i class="fa fa-trash-o"></i></button>
+        <button title="{{i18n 'post.revisions.controls.hide'}}" {{bind-attr class=":btn :standard :no-text :btn-danger" disabled=loading}} {{action "hideVersion"}}><i class="fa fa-trash-o"></i></button>
       {{/if}}
       {{#if displayShow}}
-        <button title="{{i18n post.revisions.controls.show}}" {{bind-attr class=":btn :standard :no-text" disabled=loading}} {{action "showVersion"}}><i class="fa fa-undo"></i></button>
+        <button title="{{i18n 'post.revisions.controls.show'}}" {{bind-attr class=":btn :standard :no-text" disabled=loading}} {{action "showVersion"}}><i class="fa fa-undo"></i></button>
       {{/if}}
     </div>
     <div id="display-modes">
-      <button {{bind-attr class=":btn displayingInline:btn-primary:standard"}} title="{{i18n post.revisions.displays.inline.title}}" {{action "displayInline"}}>{{{i18n post.revisions.displays.inline.button}}}</button>
+      <button {{bind-attr class=":btn displayingInline:btn-primary:standard"}} title="{{i18n 'post.revisions.displays.inline.title'}}" {{action "displayInline"}}>{{{i18n 'post.revisions.displays.inline.button'}}}</button>
       {{#unless site.mobileView}}
-        <button {{bind-attr class=":btn displayingSideBySide:btn-primary:standard"}} title="{{i18n post.revisions.displays.side_by_side.title}}" {{action "displaySideBySide"}}>{{{i18n post.revisions.displays.side_by_side.button}}}</button>
-        <button {{bind-attr class=":btn displayingSideBySideMarkdown:btn-primary:standard"}} title="{{i18n post.revisions.displays.side_by_side_markdown.title}}" {{action "displaySideBySideMarkdown"}}>{{{i18n post.revisions.displays.side_by_side_markdown.button}}}</button>
+        <button {{bind-attr class=":btn displayingSideBySide:btn-primary:standard"}} title="{{i18n 'post.revisions.displays.side_by_side.title'}}" {{action "displaySideBySide"}}>{{{i18n 'post.revisions.displays.side_by_side.button'}}}</button>
+        <button {{bind-attr class=":btn displayingSideBySideMarkdown:btn-primary:standard"}} title="{{i18n 'post.revisions.displays.side_by_side_markdown.title'}}" {{action "displaySideBySideMarkdown"}}>{{{i18n 'post.revisions.displays.side_by_side_markdown.button'}}}</button>
       {{/unless}}
     </div>
   </div>
   <div id="revision-details">
-    {{i18n post.revisions.details.edited_by}}
+    {{i18n 'post.revisions.details.edited_by'}}
     {{#link-to 'user' username}}
       {{bound-avatar-template content.avatar_template "small"}} {{username}}
     {{/link-to}}
diff --git a/app/assets/javascripts/discourse/templates/modal/invite.hbs b/app/assets/javascripts/discourse/templates/modal/invite.hbs
index d2a129f56..dd7689add 100644
--- a/app/assets/javascripts/discourse/templates/modal/invite.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/invite.hbs
@@ -2,7 +2,7 @@
   {{#if error}}
     <div class="alert alert-error">
       <button class="close" data-dismiss="alert">×</button>
-      {{i18n topic.invite_reply.error}}
+      {{i18n 'topic.invite_reply.error'}}
     </div>
   {{/if}}
 
@@ -21,7 +21,7 @@
 </div>
 <div class="modal-footer">
   {{#if finished}}
-    <button class='btn btn-primary' {{action "closeModal"}}>{{i18n close}}</button>
+    <button class='btn btn-primary' {{action "closeModal"}}>{{i18n 'close'}}</button>
   {{else}}
     <button class='btn btn-primary' {{bind-attr disabled="disabled"}} {{action "createInvite"}}><i class="fa fa-envelope"></i>{{buttonTitle}}</button>
   {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/modal/invite_private.hbs b/app/assets/javascripts/discourse/templates/modal/invite_private.hbs
index d4635dead..47e8cd267 100644
--- a/app/assets/javascripts/discourse/templates/modal/invite_private.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/invite_private.hbs
@@ -2,20 +2,20 @@
   {{#if error}}
     <div class="alert alert-error">
       <button class="close" data-dismiss="alert">×</button>
-      {{i18n topic.invite_private.error}}
+      {{i18n 'topic.invite_private.error'}}
     </div>
   {{/if}}
 
   {{#if finished}}
-    {{i18n topic.invite_private.success}}
+    {{i18n 'topic.invite_private.success'}}
   {{else}}
-    <label>{{i18n topic.invite_private.email_or_username}}</label>
+    <label>{{i18n 'topic.invite_private.email_or_username'}}</label>
     {{user-selector single=true allowAny=true usernames=emailOrUsername include_groups="true" placeholderKey="topic.invite_private.email_or_username_placeholder"}}
   {{/if}}
 </div>
 <div class="modal-footer">
   {{#if finished}}
-    <button class='btn btn-primary' {{action "closeModal"}}>{{i18n close}}</button>
+    <button class='btn btn-primary' {{action "closeModal"}}>{{i18n 'close'}}</button>
   {{else}}
     <button class='btn btn-primary' {{bind-attr disabled="disabled"}} {{action "invite"}}>{{buttonTitle}}</button>
   {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/modal/keyboard_shortcuts_help.hbs b/app/assets/javascripts/discourse/templates/modal/keyboard_shortcuts_help.hbs
index 1c2d3adee..64de5b261 100644
--- a/app/assets/javascripts/discourse/templates/modal/keyboard_shortcuts_help.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/keyboard_shortcuts_help.hbs
@@ -1,59 +1,59 @@
 <div id="keyboard-shortcuts-help" class="modal-body">
   <div class="row">
     <div class="span6">
-      <h4>{{i18n keyboard_shortcuts_help.jump_to.title}}</h4>
+      <h4>{{i18n 'keyboard_shortcuts_help.jump_to.title'}}</h4>
       <ul>
-        <li>{{{i18n keyboard_shortcuts_help.jump_to.home}}}</li>
-        <li>{{{i18n keyboard_shortcuts_help.jump_to.latest}}}</li>
-        <li>{{{i18n keyboard_shortcuts_help.jump_to.new}}}</li>
-        <li>{{{i18n keyboard_shortcuts_help.jump_to.unread}}}</li>
-        <li>{{{i18n keyboard_shortcuts_help.jump_to.starred}}}</li>
-        <li>{{{i18n keyboard_shortcuts_help.jump_to.categories}}}</li>
-        <li>{{{i18n keyboard_shortcuts_help.jump_to.top}}}</li>
+        <li>{{{i18n 'keyboard_shortcuts_help.jump_to.home'}}}</li>
+        <li>{{{i18n 'keyboard_shortcuts_help.jump_to.latest'}}}</li>
+        <li>{{{i18n 'keyboard_shortcuts_help.jump_to.new'}}}</li>
+        <li>{{{i18n 'keyboard_shortcuts_help.jump_to.unread'}}}</li>
+        <li>{{{i18n 'keyboard_shortcuts_help.jump_to.starred'}}}</li>
+        <li>{{{i18n 'keyboard_shortcuts_help.jump_to.categories'}}}</li>
+        <li>{{{i18n 'keyboard_shortcuts_help.jump_to.top'}}}</li>
       </ul>
-      <h4>{{i18n keyboard_shortcuts_help.navigation.title}}</h4>
+      <h4>{{i18n 'keyboard_shortcuts_help.navigation.title'}}</h4>
       <ul>
-        <li>{{{i18n keyboard_shortcuts_help.navigation.back}}}</li>
-        <li>{{{i18n keyboard_shortcuts_help.navigation.jump}}}</li>
-        <li>{{{i18n keyboard_shortcuts_help.navigation.up_down}}}</li>
-        <li>{{{i18n keyboard_shortcuts_help.navigation.open}}}</li>
-        <li>{{{i18n keyboard_shortcuts_help.navigation.next_prev}}}</li>
+        <li>{{{i18n 'keyboard_shortcuts_help.navigation.back'}}}</li>
+        <li>{{{i18n 'keyboard_shortcuts_help.navigation.jump'}}}</li>
+        <li>{{{i18n 'keyboard_shortcuts_help.navigation.up_down'}}}</li>
+        <li>{{{i18n 'keyboard_shortcuts_help.navigation.open'}}}</li>
+        <li>{{{i18n 'keyboard_shortcuts_help.navigation.next_prev'}}}</li>
       </ul>
     </div>
     <div class="span6">
-      <h4>{{i18n keyboard_shortcuts_help.application.title}}</h4>
+      <h4>{{i18n 'keyboard_shortcuts_help.application.title'}}</h4>
       <ul>
-        <li>{{{i18n keyboard_shortcuts_help.application.create}}}</li>
-        <li>{{{i18n keyboard_shortcuts_help.application.notifications}}}</li>
-        <li>{{{i18n keyboard_shortcuts_help.application.site_map_menu}}}</li>
-        <li>{{{i18n keyboard_shortcuts_help.application.user_profile_menu}}}</li>
-        <li>{{{i18n keyboard_shortcuts_help.application.show_incoming_updated_topics}}}</li>
-        <li>{{{i18n keyboard_shortcuts_help.application.search}}}</li>
-        <li>{{{i18n keyboard_shortcuts_help.application.help}}}</li>
-        <li>{{{i18n keyboard_shortcuts_help.application.dismiss_new_posts}}}</li>
-        <li>{{{i18n keyboard_shortcuts_help.application.dismiss_topics}}}</li>
+        <li>{{{i18n 'keyboard_shortcuts_help.application.create'}}}</li>
+        <li>{{{i18n 'keyboard_shortcuts_help.application.notifications'}}}</li>
+        <li>{{{i18n 'keyboard_shortcuts_help.application.site_map_menu'}}}</li>
+        <li>{{{i18n 'keyboard_shortcuts_help.application.user_profile_menu'}}}</li>
+        <li>{{{i18n 'keyboard_shortcuts_help.application.show_incoming_updated_topics'}}}</li>
+        <li>{{{i18n 'keyboard_shortcuts_help.application.search'}}}</li>
+        <li>{{{i18n 'keyboard_shortcuts_help.application.help'}}}</li>
+        <li>{{{i18n 'keyboard_shortcuts_help.application.dismiss_new_posts'}}}</li>
+        <li>{{{i18n 'keyboard_shortcuts_help.application.dismiss_topics'}}}</li>
       </ul>
     </div>
     <div class="span6">
-      <h4>{{i18n keyboard_shortcuts_help.actions.title}}</h4>
+      <h4>{{i18n 'keyboard_shortcuts_help.actions.title'}}</h4>
       <ul>
-        <li>{{{i18n keyboard_shortcuts_help.actions.star}}}</li>
-        <li>{{{i18n keyboard_shortcuts_help.actions.pin_unpin_topic}}}</li>
-        <li>{{{i18n keyboard_shortcuts_help.actions.share_topic}}}</li>
-        <li>{{{i18n keyboard_shortcuts_help.actions.share_post}}}</li>
-        <li>{{{i18n keyboard_shortcuts_help.actions.reply_as_new_topic}}}</li>
-        <li>{{{i18n keyboard_shortcuts_help.actions.reply_topic}}}</li>
-        <li>{{{i18n keyboard_shortcuts_help.actions.reply_post}}}</li>
-        <li>{{{i18n keyboard_shortcuts_help.actions.quote_post}}}</li>
-        <li>{{{i18n keyboard_shortcuts_help.actions.like}}}</li>
-        <li>{{{i18n keyboard_shortcuts_help.actions.flag}}}</li>
-        <li>{{{i18n keyboard_shortcuts_help.actions.bookmark}}}</li>
-        <li>{{{i18n keyboard_shortcuts_help.actions.edit}}}</li>
-        <li>{{{i18n keyboard_shortcuts_help.actions.delete}}}</li>
-        <li>{{{i18n keyboard_shortcuts_help.actions.mark_muted}}}</li>
-        <li>{{{i18n keyboard_shortcuts_help.actions.mark_regular}}}</li>
-        <li>{{{i18n keyboard_shortcuts_help.actions.mark_tracking}}}</li>
-        <li>{{{i18n keyboard_shortcuts_help.actions.mark_watching}}}</li>
+        <li>{{{i18n 'keyboard_shortcuts_help.actions.star'}}}</li>
+        <li>{{{i18n 'keyboard_shortcuts_help.actions.pin_unpin_topic'}}}</li>
+        <li>{{{i18n 'keyboard_shortcuts_help.actions.share_topic'}}}</li>
+        <li>{{{i18n 'keyboard_shortcuts_help.actions.share_post'}}}</li>
+        <li>{{{i18n 'keyboard_shortcuts_help.actions.reply_as_new_topic'}}}</li>
+        <li>{{{i18n 'keyboard_shortcuts_help.actions.reply_topic'}}}</li>
+        <li>{{{i18n 'keyboard_shortcuts_help.actions.reply_post'}}}</li>
+        <li>{{{i18n 'keyboard_shortcuts_help.actions.quote_post'}}}</li>
+        <li>{{{i18n 'keyboard_shortcuts_help.actions.like'}}}</li>
+        <li>{{{i18n 'keyboard_shortcuts_help.actions.flag'}}}</li>
+        <li>{{{i18n 'keyboard_shortcuts_help.actions.bookmark'}}}</li>
+        <li>{{{i18n 'keyboard_shortcuts_help.actions.edit'}}}</li>
+        <li>{{{i18n 'keyboard_shortcuts_help.actions.delete'}}}</li>
+        <li>{{{i18n 'keyboard_shortcuts_help.actions.mark_muted'}}}</li>
+        <li>{{{i18n 'keyboard_shortcuts_help.actions.mark_regular'}}}</li>
+        <li>{{{i18n 'keyboard_shortcuts_help.actions.mark_tracking'}}}</li>
+        <li>{{{i18n 'keyboard_shortcuts_help.actions.mark_watching'}}}</li>
       </ul>
     </div>
   </div>
diff --git a/app/assets/javascripts/discourse/templates/modal/login.hbs b/app/assets/javascripts/discourse/templates/modal/login.hbs
index 4c0fae648..41568d1c8 100644
--- a/app/assets/javascripts/discourse/templates/modal/login.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/login.hbs
@@ -6,7 +6,7 @@
         <table>
           <tr>
             <td>
-              <label for='login-account-name'>{{i18n login.username}}&nbsp;</label>
+              <label for='login-account-name'>{{i18n 'login.username'}}&nbsp;</label>
             </td>
             <td>
               {{text-field value=loginName placeholderKey="login.email_placeholder" id="login-account-name" autocorrect="off" autocapitalize="off" autofocus="autofocus"}}
@@ -15,18 +15,18 @@
           </tr>
           <tr>
             <td>
-                <label for='login-account-password'>{{i18n login.password}}&nbsp;</label>
+                <label for='login-account-password'>{{i18n 'login.password'}}&nbsp;</label>
             </td>
             <td>
                 {{password-field value=loginPassword type="password" id="login-account-password" maxlength="200" capsLockOn=capsLockOn}} &nbsp;
             </td>
             <td>
-              <a id="forgot-password-link" {{action "showForgotPassword"}}>{{i18n forgot_password.action}}</a>
+              <a id="forgot-password-link" {{action "showForgotPassword"}}>{{i18n 'forgot_password.action'}}</a>
             </td>
           </tr>
           <tr>
             <td></td>
-            <td><div {{bind-attr class=":caps-lock-warning capsLockOn::invisible"}}><i class="fa fa-exclamation-triangle"></i> {{i18n login.caps_lock_warning}}</div></td>
+            <td><div {{bind-attr class=":caps-lock-warning capsLockOn::invisible"}}><i class="fa fa-exclamation-triangle"></i> {{i18n 'login.caps_lock_warning'}}</div></td>
             <td></td>
           </tr>
         </table>
@@ -47,13 +47,13 @@
     {{#if showSignupLink}}
       &nbsp;
       <button class="btn btn-large" id="new-account-link" {{action "createAccount"}}>
-        {{i18n create_account.title}}
+        {{i18n 'create_account.title'}}
       </button>
     {{/if}}
   {{/if}}
 
   {{#if authenticate}}
-    &nbsp; {{i18n login.authenticating}}
+    &nbsp; {{i18n 'login.authenticating'}}
   {{/if}}
 
   {{loading-spinner condition=showSpinner size="small"}}
diff --git a/app/assets/javascripts/discourse/templates/modal/merge_topic.hbs b/app/assets/javascripts/discourse/templates/modal/merge_topic.hbs
index b6a7b5269..cd13edbf9 100644
--- a/app/assets/javascripts/discourse/templates/modal/merge_topic.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/merge_topic.hbs
@@ -5,7 +5,7 @@
     </div>
   {{/if}}
 
-  <p>{{{i18n topic.merge_topic.instructions count="selectedPostsCount"}}}</p>
+  <p>{{{i18n 'topic.merge_topic.instructions' count="selectedPostsCount"}}}</p>
 
   <form>
     {{choose-topic selectedTopicId=selectedTopicId}}
diff --git a/app/assets/javascripts/discourse/templates/modal/not_activated.hbs b/app/assets/javascripts/discourse/templates/modal/not_activated.hbs
index cee8245db..f4d0f2e14 100644
--- a/app/assets/javascripts/discourse/templates/modal/not_activated.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/not_activated.hbs
@@ -1,11 +1,11 @@
 <div class="modal-body">
   {{#if emailSent}}
-    {{{i18n login.sent_activation_email_again currentEmail="currentEmail"}}}
+    {{{i18n 'login.sent_activation_email_again' currentEmail="currentEmail"}}}
   {{else}}
-    {{{i18n login.not_activated sentTo="sentTo"}}}
-    <a href="#" {{action "sendActivationEmail"}}>{{i18n login.resend_activation_email}}</a>
+    {{{i18n 'login.not_activated' sentTo="sentTo"}}}
+    <a href="#" {{action "sendActivationEmail"}}>{{i18n 'login.resend_activation_email'}}</a>
   {{/if}}
 </div>
 <div class="modal-footer">
-  <button class='btn btn-primary' {{action "closeModal"}}>{{i18n close}}</button>
+  <button class='btn btn-primary' {{action "closeModal"}}>{{i18n 'close'}}</button>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/modal/raw_email.hbs b/app/assets/javascripts/discourse/templates/modal/raw_email.hbs
index beaf5cb72..ad9f7ec50 100644
--- a/app/assets/javascripts/discourse/templates/modal/raw_email.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/raw_email.hbs
@@ -2,6 +2,6 @@
   {{#if rawEmail}}
     {{textarea value=rawEmail class="raw-email-textarea"}}
   {{else}}
-    {{i18n raw_email.not_available}}
+    {{i18n 'raw_email.not_available'}}
   {{/if}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/modal/search_help.hbs b/app/assets/javascripts/discourse/templates/modal/search_help.hbs
index 5a9bf72d9..044ded433 100644
--- a/app/assets/javascripts/discourse/templates/modal/search_help.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/search_help.hbs
@@ -1,6 +1,6 @@
 <div id="search-help" class="modal-body">
   {{{model}}}
   {{#if showGoogleSearch}}
-    {{{i18n google_search}}}
+    {{{i18n 'google_search'}}}
   {{/if}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/modal/split_topic.hbs b/app/assets/javascripts/discourse/templates/modal/split_topic.hbs
index ce83a0f19..820b7f0d1 100644
--- a/app/assets/javascripts/discourse/templates/modal/split_topic.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/split_topic.hbs
@@ -5,13 +5,13 @@
     </div>
   {{/if}}
 
-  {{{i18n topic.split_topic.instructions count="selectedPostsCount"}}}
+  {{{i18n 'topic.split_topic.instructions' count="selectedPostsCount"}}}
 
   <form>
-    <label>{{i18n topic.split_topic.topic_name}}</label>
+    <label>{{i18n 'topic.split_topic.topic_name'}}</label>
     {{text-field value=topicName placeholderKey="composer.title_placeholder" elementId='split-topic-name'}}
 
-    <label>{{i18n categories.category}}</label>
+    <label>{{i18n 'categories.category'}}</label>
     {{category-chooser value=categoryId}}
   </form>
 
diff --git a/app/assets/javascripts/discourse/templates/modal/topic_bulk_actions.hbs b/app/assets/javascripts/discourse/templates/modal/topic_bulk_actions.hbs
index 652dd8351..330de1ad8 100644
--- a/app/assets/javascripts/discourse/templates/modal/topic_bulk_actions.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/topic_bulk_actions.hbs
@@ -1,6 +1,6 @@
 <div class='modal-body'>
 
-  <p>{{{i18n topics.bulk.selected count=length}}}</p>
+  <p>{{{i18n 'topics.bulk.selected' count=length}}}</p>
 
   {{outlet "bulkOutlet"}}
 
diff --git a/app/assets/javascripts/discourse/templates/modal/upload_selector.hbs b/app/assets/javascripts/discourse/templates/modal/upload_selector.hbs
index cba106723..9957e2ffc 100644
--- a/app/assets/javascripts/discourse/templates/modal/upload_selector.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/upload_selector.hbs
@@ -2,7 +2,7 @@
   {{#if allowLocal}}
     <div class="radios">
       <input type="radio" id="local" value="local" name="upload" {{action "useLocal"}}>
-      <label class="radio" for="local">{{i18n upload_selector.from_my_computer}}</label>
+      <label class="radio" for="local">{{i18n 'upload_selector.from_my_computer'}}</label>
       {{#if local}}
         <div class="inputs">
           <input type="file" id="filename-input"><br>
@@ -13,7 +13,7 @@
   {{/if}}
   <div class="radios">
     <input type="radio" id="remote" value="remote" name="upload" {{action "useRemote"}}>
-    <label class="radio" for="remote">{{i18n upload_selector.from_the_web}}</label>
+    <label class="radio" for="remote">{{i18n 'upload_selector.from_the_web'}}</label>
     {{#if remote}}
       <div class="inputs">
         <input type="text" id="fileurl-input" placeholder="http://example.com/image.png"><br>
@@ -25,7 +25,7 @@
     <div class="radios">
       <div class="inputs">
         <input type="text" id="link-input" placeholder="http://example.com"><br>
-        <span class="description">{{i18n upload_selector.image_link}}</span>
+        <span class="description">{{i18n 'upload_selector.image_link'}}</span>
       </div>
     </div>
   {{/if}}
@@ -39,8 +39,8 @@
 <div class="modal-footer">
   <button class="btn btn-primary" {{action "upload" target="view"}}>
     <span class='add-upload'><i {{bind-attr class=":fa view.uploadIcon"}}></i><i class='fa fa-plus'></i></span>
-    {{i18n upload}}
+    {{i18n 'upload'}}
   </button>
-  <a {{action "closeModal"}}>{{i18n cancel}}</a>
-  {{#if remote}}<a {{action "toggleShowMore"}} class="pull-right">{{i18n show_more}}</a>{{/if}}
+  <a {{action "closeModal"}}>{{i18n 'cancel'}}</a>
+  {{#if remote}}<a {{action "toggleShowMore"}} class="pull-right">{{i18n 'show_more'}}</a>{{/if}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/navigation/categories.hbs b/app/assets/javascripts/discourse/templates/navigation/categories.hbs
index 7644841f5..1db91ae46 100644
--- a/app/assets/javascripts/discourse/templates/navigation/categories.hbs
+++ b/app/assets/javascripts/discourse/templates/navigation/categories.hbs
@@ -8,8 +8,8 @@
 </ul>
 
 {{#if canCreateCategory}}
-  <button class='btn btn-default' {{action "createCategory"}}><i class='fa fa-plus'></i>{{i18n category.create}}</button>
+  <button class='btn btn-default' {{action "createCategory"}}><i class='fa fa-plus'></i>{{i18n 'category.create'}}</button>
 {{/if}}
 {{#if canCreateTopic}}
-  <button id="create-topic" class='btn btn-default' {{action "createTopic"}}><i class='fa fa-plus'></i>{{i18n topic.create}}</button>
+  <button id="create-topic" class='btn btn-default' {{action "createTopic"}}><i class='fa fa-plus'></i>{{i18n 'topic.create'}}</button>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/navigation/category.hbs b/app/assets/javascripts/discourse/templates/navigation/category.hbs
index ef35bd249..4eb82f2fe 100644
--- a/app/assets/javascripts/discourse/templates/navigation/category.hbs
+++ b/app/assets/javascripts/discourse/templates/navigation/category.hbs
@@ -15,11 +15,11 @@
 {{/if}}
 
 {{#if canCreateTopic}}
-  <button id="create-topic" class='btn btn-default' {{action "createTopic"}}><i class='fa fa-plus'></i>{{i18n topic.create}}</button>
+  <button id="create-topic" class='btn btn-default' {{action "createTopic"}}><i class='fa fa-plus'></i>{{i18n 'topic.create'}}</button>
 {{/if}}
 
 {{#if canEditCategory}}
-  <button class='btn btn-default' {{action "editCategory" category}}><i class="fa fa-wrench"></i> {{i18n category.edit_long}}</button>
+  <button class='btn btn-default' {{action "editCategory" category}}><i class="fa fa-wrench"></i> {{i18n 'category.edit_long'}}</button>
 {{/if}}
 
 <section class='category-heading'>
diff --git a/app/assets/javascripts/discourse/templates/navigation/default.hbs b/app/assets/javascripts/discourse/templates/navigation/default.hbs
index 88b276198..bd3015d44 100644
--- a/app/assets/javascripts/discourse/templates/navigation/default.hbs
+++ b/app/assets/javascripts/discourse/templates/navigation/default.hbs
@@ -8,5 +8,5 @@
 </ul>
 
 {{#if canCreateTopic}}
-  <button id="create-topic" class='btn btn-default' {{action "createTopic"}}><i class='fa fa-plus'></i>{{i18n topic.create}}</button>
+  <button id="create-topic" class='btn btn-default' {{action "createTopic"}}><i class='fa fa-plus'></i>{{i18n 'topic.create'}}</button>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/notifications.hbs b/app/assets/javascripts/discourse/templates/notifications.hbs
index 491ece627..5462af920 100644
--- a/app/assets/javascripts/discourse/templates/notifications.hbs
+++ b/app/assets/javascripts/discourse/templates/notifications.hbs
@@ -6,11 +6,11 @@
           {{notification-item notification=this scope=scope}}
         {{/each}}
         <li class="read last">
-          <a href="/my/notifications">{{i18n notifications.more}}&hellip;</a>
+          <a href="/my/notifications">{{i18n 'notifications.more'}}&hellip;</a>
         </li>
       </ul>
     {{else}}
-      <div class="none">{{i18n notifications.none}}</div>
+      <div class="none">{{i18n 'notifications.none'}}</div>
     {{/if}}
   {{/loading-spinner}}
 </section>
diff --git a/app/assets/javascripts/discourse/templates/post.hbs b/app/assets/javascripts/discourse/templates/post.hbs
index 6ff402a4c..7558a0944 100644
--- a/app/assets/javascripts/discourse/templates/post.hbs
+++ b/app/assets/javascripts/discourse/templates/post.hbs
@@ -27,12 +27,12 @@
         {{#if hasHistory}}
           <div class='post-info edits'>
             {{#if can_view_edit_history}}
-              <a href class="{{unbound view.historyHeat}}" {{action "showHistory" this}} title="{{i18n post.last_edited_on}} {{raw-date updated_at}}">
+              <a href class="{{unbound view.historyHeat}}" {{action "showHistory" this}} title="{{i18n 'post.last_edited_on'}} {{raw-date updated_at}}">
                 {{editCount}}
                 <i class='fa fa-pencil'></i>
               </a>
             {{else}}
-              <span class="{{unbound view.historyHeat}}" title="{{i18n post.last_edited_on}} {{raw-date updated_at}}">
+              <span class="{{unbound view.historyHeat}}" title="{{i18n 'post.last_edited_on'}} {{raw-date updated_at}}">
                 {{editCount}}
                 <i class='fa fa-pencil'></i>
               </span>
@@ -40,19 +40,19 @@
           </div>
         {{/if}}
         {{#if wiki}}
-          <div class="post-info wiki" title="{{i18n post.wiki.about}}" {{action "editPost" this}}>{{fa-icon "pencil-square-o"}}</div>
+          <div class="post-info wiki" title="{{i18n 'post.wiki.about'}}" {{action "editPost" this}}>{{fa-icon "pencil-square-o"}}</div>
         {{/if}}
         {{#if via_email}}
           {{#if canViewRawEmail}}
-            <div class="post-info via-email raw-email" title="{{i18n post.via_email}}" {{action "showRawEmail" this}}>{{fa-icon "envelope-o"}}</div>
+            <div class="post-info via-email raw-email" title="{{i18n 'post.via_email'}}" {{action "showRawEmail" this}}>{{fa-icon "envelope-o"}}</div>
           {{else}}
-            <div class="post-info via-email" title="{{i18n post.via_email}}">{{fa-icon "envelope-o"}}</div>
+            <div class="post-info via-email" title="{{i18n 'post.via_email'}}">{{fa-icon "envelope-o"}}</div>
           {{/if}}
         {{/if}}
         {{#if showUserReplyTab}}
         <a href {{action "toggleReplyHistory" this target="view"}} class='reply-to-tab'>
           {{#if loadingReplyHistory}}
-          {{i18n loading}}
+          {{i18n 'loading'}}
           {{else}}
           <i class="fa fa-mail-forward"></i>
           {{avatar reply_to_user imageSize="tiny"}}
@@ -60,11 +60,11 @@
           {{/if}}
         </a>
         {{/if}}
-        <div {{bind-attr class=":read-state read"}} title="{{i18n post.unread}}">{{fa-icon "circle"}}</div>
+        <div {{bind-attr class=":read-state read"}} title="{{i18n 'post.unread'}}">{{fa-icon "circle"}}</div>
       </div>
 
       <div {{bind-attr class=":select-posts controller.multiSelect::hidden"}}>
-        <button {{action "toggledSelectedPostReplies" this}} {{bind-attr class="view.canSelectReplies::hidden"}}>{{i18n topic.multi_select.select_replies}}</button>
+        <button {{action "toggledSelectedPostReplies" this}} {{bind-attr class="view.canSelectReplies::hidden"}}>{{i18n 'topic.multi_select.select_replies'}}</button>
         <button {{action "toggledSelectedPost" this}} class="select-post">{{view.selectPostText}}</button>
       </div>
 
@@ -74,13 +74,13 @@
           {{{cooked}}}
         </div>
         {{#if cooked_hidden}}
-          <a href {{action "expandHidden" this}}>{{i18n post.show_hidden}}</a>
+          <a href {{action "expandHidden" this}}>{{i18n 'post.show_hidden'}}</a>
         {{/if}}
         {{#if view.showExpandButton}}
           {{#if controller.loadingExpanded}}
-            <button class="btn expand-post" disabled>{{i18n loading}}</button>
+            <button class="btn expand-post" disabled>{{i18n 'loading'}}</button>
           {{else}}
-            <button {{action "expandFirstPost" this}} class='btn expand-post'>{{i18n post.show_full}}&hellip;</button>
+            <button {{action "expandFirstPost" this}} class='btn expand-post'>{{i18n 'post.show_full'}}&hellip;</button>
           {{/if}}
         {{/if}}
         {{view 'post-menu' post=this adminMenu=view.adminMenu}}
diff --git a/app/assets/javascripts/discourse/templates/preferences/card-badge.hbs b/app/assets/javascripts/discourse/templates/preferences/card-badge.hbs
index 8a36a795d..e62caac30 100644
--- a/app/assets/javascripts/discourse/templates/preferences/card-badge.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/card-badge.hbs
@@ -3,7 +3,7 @@
 
     <div class="control-group">
       <div class="controls">
-        <h3>{{i18n user.card_badge.title}}</h3>
+        <h3>{{i18n 'user.card_badge.title'}}</h3>
       </div>
     </div>
 
@@ -17,7 +17,7 @@
     <div class="control-group">
       <div class="controls">
         <button class="btn btn-primary" {{bind-attr disabled=disableSave}} {{action "save"}}>{{savingStatus}}</button>
-        {{#if saved}}{{i18n saved}}{{/if}}
+        {{#if saved}}{{i18n 'saved'}}{{/if}}
       </div>
     </div>
 
diff --git a/app/assets/javascripts/discourse/templates/search.hbs b/app/assets/javascripts/discourse/templates/search.hbs
index 85a04bf4c..dbf7f7c8f 100644
--- a/app/assets/javascripts/discourse/templates/search.hbs
+++ b/app/assets/javascripts/discourse/templates/search.hbs
@@ -5,7 +5,7 @@
     {{input type="checkbox" name="searchContext" checked=searchContextEnabled}} {{searchContextDescription}}
     </label>
   {{/if}}
-  <a href="#" class="show-help" {{action "showSearchHelp" bubbles=false}}>{{i18n show_help}}</a>
+  <a href="#" class="show-help" {{action "showSearchHelp" bubbles=false}}>{{i18n 'show_help'}}</a>
 </div>
 {{#if loading}}
   <div class='searching'>{{loading-spinner}}</div>
@@ -21,14 +21,14 @@
       </ul>
         <div class='no-results'>
             {{#if resultType.more}}
-                <a href='#' class='filter' {{action "moreOfType" resultType.type bubbles=false}}>{{i18n show_more}} <i class="fa fa-chevron-down"></i></a>
+                <a href='#' class='filter' {{action "moreOfType" resultType.type bubbles=false}}>{{i18n 'show_more'}} <i class="fa fa-chevron-down"></i></a>
             {{else}}
             {{/if}}
         </div>
     {{/each}}
   {{else}}
     <div class='no-results'>
-      {{i18n search.no_results}}
+      {{i18n 'search.no_results'}}
     </div>
   {{/unless}}
   </div>
diff --git a/app/assets/javascripts/discourse/templates/search/post_result.hbs b/app/assets/javascripts/discourse/templates/search/post_result.hbs
index ca9caad16..197ba5164 100644
--- a/app/assets/javascripts/discourse/templates/search/post_result.hbs
+++ b/app/assets/javascripts/discourse/templates/search/post_result.hbs
@@ -1,6 +1,6 @@
 <a class='search-link' href='{{unbound url}}'>
   <span class='topic'>
-    {{i18n search.post_format post_number=post_number username=username}}
+    {{i18n 'search.post_format' post_number=post_number username=username}}
   </span>
   {{#unless controller.site.mobileView}}
     <span class='blurb'>
diff --git a/app/assets/javascripts/discourse/templates/selected_posts.hbs b/app/assets/javascripts/discourse/templates/selected_posts.hbs
index a64a0aa3f..9444999c6 100644
--- a/app/assets/javascripts/discourse/templates/selected_posts.hbs
+++ b/app/assets/javascripts/discourse/templates/selected_posts.hbs
@@ -1,25 +1,25 @@
 <p>{{countI18n topic.multi_select.description countBinding="selectedPostsCount"}}</p>
 
 {{#if canSelectAll}}
-  <p><a href='#' {{action "selectAll"}}>{{i18n topic.multi_select.select_all}}</a></p>
+  <p><a href='#' {{action "selectAll"}}>{{i18n 'topic.multi_select.select_all'}}</a></p>
 {{/if}}
 
 {{#if canDeselectAll}}
-  <p><a href='#' {{action "deselectAll"}}>{{i18n topic.multi_select.deselect_all}}</a></p>
+  <p><a href='#' {{action "deselectAll"}}>{{i18n 'topic.multi_select.deselect_all'}}</a></p>
 {{/if}}
 
 {{#if canDeleteSelected}}
-  <button class='btn' {{action "deleteSelected"}}><i class='fa fa-trash-o'></i> {{i18n topic.multi_select.delete}}</button>
+  <button class='btn' {{action "deleteSelected"}}><i class='fa fa-trash-o'></i> {{i18n 'topic.multi_select.delete'}}</button>
 {{/if}}
 
 {{#if canSplitTopic}}
-  <button class='btn' {{action "splitTopic"}}><i class='fa fa-sign-out'></i> {{i18n topic.split_topic.action}}</button>
+  <button class='btn' {{action "splitTopic"}}><i class='fa fa-sign-out'></i> {{i18n 'topic.split_topic.action'}}</button>
 {{/if}}
 {{#if canMergeTopic}}
-  <button class='btn' {{action "mergeTopic"}}><i class='fa fa-sign-out'></i> {{i18n topic.merge_topic.action}}</button>
+  <button class='btn' {{action "mergeTopic"}}><i class='fa fa-sign-out'></i> {{i18n 'topic.merge_topic.action'}}</button>
 {{/if}}
 {{#if canChangeOwner}}
-  <button class='btn' {{action "changeOwner"}}><i class='fa fa-user'></i> {{i18n topic.change_owner.action}}</button>
+  <button class='btn' {{action "changeOwner"}}><i class='fa fa-user'></i> {{i18n 'topic.change_owner.action'}}</button>
 {{/if}}
 
-<p class='cancel'><a href='#' {{action "toggleMultiSelect"}}>{{i18n topic.multi_select.cancel}}</a></p>
+<p class='cancel'><a href='#' {{action "toggleMultiSelect"}}>{{i18n 'topic.multi_select.cancel'}}</a></p>
diff --git a/app/assets/javascripts/discourse/templates/share.hbs b/app/assets/javascripts/discourse/templates/share.hbs
index 763027ef6..303ff6ef8 100644
--- a/app/assets/javascripts/discourse/templates/share.hbs
+++ b/app/assets/javascripts/discourse/templates/share.hbs
@@ -12,5 +12,5 @@
 {{each shareLinks itemView='share-link'}}
 
 <div class='link'>
-  <a href='#' {{action "close"}} title='{{i18n share.close}}'><i class="fa fa-times-circle"></i></a>
+  <a href='#' {{action "close"}} title='{{i18n 'share.close'}}'><i class="fa fa-times-circle"></i></a>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/site_map.hbs b/app/assets/javascripts/discourse/templates/site_map.hbs
index df8f8d7ee..794c30074 100644
--- a/app/assets/javascripts/discourse/templates/site_map.hbs
+++ b/app/assets/javascripts/discourse/templates/site_map.hbs
@@ -2,33 +2,33 @@
   <ul class="location-links">
     {{#if showAdminLinks}}
       <li>
-        <a href="/admin" class="admin-link"><i class='fa fa-wrench'></i> {{i18n admin_title}}</a>
+        <a href="/admin" class="admin-link"><i class='fa fa-wrench'></i> {{i18n 'admin_title'}}</a>
       </li>
       <li>
         <a href="/admin/flags/active" class="flagged-posts-link">
-          <i class='fa fa-flag'></i> {{i18n flags_title}}
+          <i class='fa fa-flag'></i> {{i18n 'flags_title'}}
           {{#if flaggedPostsCount}}
-            <span title='{{i18n notifications.total_flagged}}' class='badge-notification flagged-posts'>{{flaggedPostsCount}}</span>
+            <span title='{{i18n 'notifications.total_flagged'}}' class='badge-notification flagged-posts'>{{flaggedPostsCount}}</span>
           {{/if}}
         </a>
       </li>
     {{/if}}
     <li>
-      <a href="/latest" title="{{i18n filters.latest.help}}" class="latest-topics-link">{{i18n filters.latest.title}}</a>
+      <a href="/latest" title="{{i18n 'filters.latest.help'}}" class="latest-topics-link">{{i18n 'filters.latest.title'}}</a>
     </li>
     {{#if showBadgesLink}}
       <li>
-        <a href="{{unbound badgesUrl}}" class="badge-link">{{i18n badges.title}}</a>
+        <a href="{{unbound badgesUrl}}" class="badge-link">{{i18n 'badges.title'}}</a>
       </li>
     {{/if}}
     {{#if showKeyboardShortcuts}}
-      <li><a href="#" {{action "keyboardShortcuts"}} class="keyboard-shortcuts-link">{{i18n keyboard_shortcuts_help.title}}</a></li>
+      <li><a href="#" {{action "keyboardShortcuts"}} class="keyboard-shortcuts-link">{{i18n 'keyboard_shortcuts_help.title'}}</a></li>
     {{/if}}
     <li>
-      <a href="{{unbound faqUrl}}" class="faq-link">{{i18n faq}}</a>
+      <a href="{{unbound faqUrl}}" class="faq-link">{{i18n 'faq'}}</a>
     </li>
     <li>
-      {{#link-to 'about'}}{{i18n about.simple_title}}{{/link-to}}
+      {{#link-to 'about'}}{{i18n 'about.simple_title'}}{{/link-to}}
     </li>
     {{#if showMobileToggle}}
       <li><a href="#" class="mobile-toggle-link" {{action "toggleMobileView"}}>{{boundI18n mobileViewLinkTextKey}}</a></li>
@@ -37,8 +37,8 @@
 
   {{#if categories}}
     <ul class="category-links">
-      <li class="heading" title="{{i18n filters.categories.help}}">
-        {{#link-to "discovery.categories"}}{{i18n filters.categories.title}}{{/link-to}}
+      <li class="heading" title="{{i18n 'filters.categories.help'}}">
+        {{#link-to "discovery.categories"}}{{i18n 'filters.categories.title'}}{{/link-to}}
       </li>
 
       {{#each categories itemController='site-map-category'}}
diff --git a/app/assets/javascripts/discourse/templates/static.hbs b/app/assets/javascripts/discourse/templates/static.hbs
index e6aa2f99a..ff09643a7 100644
--- a/app/assets/javascripts/discourse/templates/static.hbs
+++ b/app/assets/javascripts/discourse/templates/static.hbs
@@ -3,7 +3,7 @@
     {{{html}}}
 
     {{#if showLoginButton}}
-      <button class="btn btn-primary" {{action "showLogin"}}><i class="fa fa-user"></i>{{i18n log_in}}</button>
+      <button class="btn btn-primary" {{action "showLogin"}}><i class="fa fa-user"></i>{{i18n 'log_in'}}</button>
     {{/if}}
   </div>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/topic-admin-menu.hbs b/app/assets/javascripts/discourse/templates/topic-admin-menu.hbs
index b2ec69b1e..0b724ec24 100644
--- a/app/assets/javascripts/discourse/templates/topic-admin-menu.hbs
+++ b/app/assets/javascripts/discourse/templates/topic-admin-menu.hbs
@@ -1,49 +1,49 @@
-<h3>{{i18n admin_title}}</h3>
+<h3>{{i18n 'admin_title'}}</h3>
 
 <ul>
     <li>
-      <button {{action "toggleMultiSelect"}} class='btn btn-admin'>{{fa-icon tasks}} {{i18n topic.actions.multi_select}}</button>
+      <button {{action "toggleMultiSelect"}} class='btn btn-admin'>{{fa-icon tasks}} {{i18n 'topic.actions.multi_select'}}</button>
     </li>
 
   {{#if details.can_delete}}
     <li>
-      <button {{action "deleteTopic"}} class='btn btn-admin btn-danger'>{{fa-icon trash-o}} {{i18n topic.actions.delete}}</button>
+      <button {{action "deleteTopic"}} class='btn btn-admin btn-danger'>{{fa-icon trash-o}} {{i18n 'topic.actions.delete'}}</button>
     </li>
   {{/if}}
 
   {{#if showRecover}}
     <li>
-      <button {{action "recoverTopic"}} class='btn btn-admin'>{{fa-icon undo}} {{i18n topic.actions.recover}}</button>
+      <button {{action "recoverTopic"}} class='btn btn-admin'>{{fa-icon undo}} {{i18n 'topic.actions.recover'}}</button>
     </li>
   {{/if}}
 
   <li>
     {{#if closed}}
-      <button {{action "toggleClosed"}} class='btn btn-admin'>{{fa-icon unlock}} {{i18n topic.actions.open}}</button>
+      <button {{action "toggleClosed"}} class='btn btn-admin'>{{fa-icon unlock}} {{i18n 'topic.actions.open'}}</button>
     {{else}}
-      <button {{action "toggleClosed"}} class='btn btn-admin'>{{fa-icon lock}} {{i18n topic.actions.close}}</button>
-      <button {{action "showAutoClose"}} class='btn btn-admin'>{{fa-icon clock-o}} {{i18n topic.actions.auto_close}}</button>
+      <button {{action "toggleClosed"}} class='btn btn-admin'>{{fa-icon lock}} {{i18n 'topic.actions.close'}}</button>
+      <button {{action "showAutoClose"}} class='btn btn-admin'>{{fa-icon clock-o}} {{i18n 'topic.actions.auto_close'}}</button>
     {{/if}}
   </li>
 
   {{#unless isPrivateMessage}}
     <li>
       {{#if isBanner}}
-        <button {{action "removeBanner"}} class='btn btn-admin'>{{fa-icon bullhorn}} {{i18n topic.actions.remove_banner}}</button>
+        <button {{action "removeBanner"}} class='btn btn-admin'>{{fa-icon bullhorn}} {{i18n 'topic.actions.remove_banner'}}</button>
       {{else}}
         {{#if visible}}
-          <button {{action "makeBanner"}} class='btn btn-admin'>{{fa-icon bullhorn}} {{i18n topic.actions.make_banner}}</button>
+          <button {{action "makeBanner"}} class='btn btn-admin'>{{fa-icon bullhorn}} {{i18n 'topic.actions.make_banner'}}</button>
         {{/if}}
       {{/if}}
     </li>
 
     <li>
       {{#if pinned_at}}
-        <button {{action "togglePinned"}} class='btn btn-admin'>{{fa-icon thumb-tack}} {{i18n topic.actions.unpin}}</button>
+        <button {{action "togglePinned"}} class='btn btn-admin'>{{fa-icon thumb-tack}} {{i18n 'topic.actions.unpin'}}</button>
       {{else}}
         {{#if visible}}
-          <button {{action "togglePinned"}} class='btn btn-admin'>{{fa-icon thumb-tack}} {{i18n topic.actions.pin}}</button>
-          <button {{action "togglePinnedGlobally"}} class='btn btn-admin'>{{fa-icon thumb-tack}} {{i18n topic.actions.pin_globally}}</button>
+          <button {{action "togglePinned"}} class='btn btn-admin'>{{fa-icon thumb-tack}} {{i18n 'topic.actions.pin'}}</button>
+          <button {{action "togglePinnedGlobally"}} class='btn btn-admin'>{{fa-icon thumb-tack}} {{i18n 'topic.actions.pin_globally'}}</button>
         {{/if}}
       {{/if}}
     </li>
@@ -51,17 +51,17 @@
 
   <li>
     {{#if archived}}
-      <button {{action "toggleArchived"}} class='btn btn-admin'>{{fa-icon folder}} {{i18n topic.actions.unarchive}}</button>
+      <button {{action "toggleArchived"}} class='btn btn-admin'>{{fa-icon folder}} {{i18n 'topic.actions.unarchive'}}</button>
     {{else}}
-      <button {{action "toggleArchived"}} class='btn btn-admin'>{{fa-icon folder}} {{i18n topic.actions.archive}}</button>
+      <button {{action "toggleArchived"}} class='btn btn-admin'>{{fa-icon folder}} {{i18n 'topic.actions.archive'}}</button>
     {{/if}}
   </li>
 
   <li>
     {{#if visible}}
-      <button {{action "toggleVisibility"}} class='btn btn-admin'>{{fa-icon eye-slash}} {{i18n topic.actions.invisible}}</button>
+      <button {{action "toggleVisibility"}} class='btn btn-admin'>{{fa-icon eye-slash}} {{i18n 'topic.actions.invisible'}}</button>
     {{else}}
-      <button {{action "toggleVisibility"}} class='btn btn-admin'>{{fa-icon eye}} {{i18n topic.actions.visible}}</button>
+      <button {{action "toggleVisibility"}} class='btn btn-admin'>{{fa-icon eye}} {{i18n 'topic.actions.visible'}}</button>
     {{/if}}
   </li>
 
diff --git a/app/assets/javascripts/discourse/templates/topic-progress.hbs b/app/assets/javascripts/discourse/templates/topic-progress.hbs
index a04f5bec4..ab575a641 100644
--- a/app/assets/javascripts/discourse/templates/topic-progress.hbs
+++ b/app/assets/javascripts/discourse/templates/topic-progress.hbs
@@ -2,18 +2,18 @@
   <nav id='topic-progress-expanded'>
     <button {{action "jumpTop"}} {{bind-attr disabled=jumpTopDisabled}} class='btn full no-text'>
       <i class="fa fa-caret-up"></i>
-      {{i18n topic.progress.go_top}}
+      {{i18n 'topic.progress.go_top'}}
     </button>
     <div class='jump-form'>
-      {{input value=toPostIndex}} <button {{action "jumpPost"}} class='btn'>{{i18n topic.progress.go}}</button>
+      {{input value=toPostIndex}} <button {{action "jumpPost"}} class='btn'>{{i18n 'topic.progress.go'}}</button>
     </div>
     <button {{action "jumpBottom"}} {{bind-attr disabled=jumpBottomDisabled}} class='btn full no-text jump-bottom'>
-      {{i18n topic.progress.go_bottom}}
+      {{i18n 'topic.progress.go_bottom'}}
       <i class="fa fa-caret-down"></i>
     </button>
   </nav>
 {{/if}}
-<nav id='topic-progress' title="{{i18n topic.progress.title}}" {{bind-attr class="hideProgress:hidden"}}>
+<nav id='topic-progress' title="{{i18n 'topic.progress.title'}}" {{bind-attr class="hideProgress:hidden"}}>
   <div class='nums'>
     <h4>{{progressPosition}}</h4><span {{bind-attr class="hugeNumberOfPosts:hidden"}}> <span>/</span> <h4>{{postStream.filteredPostsCount}}</h4></span>
   </div>
diff --git a/app/assets/javascripts/discourse/templates/topic.hbs b/app/assets/javascripts/discourse/templates/topic.hbs
index 7d4d26a47..0a63267ea 100644
--- a/app/assets/javascripts/discourse/templates/topic.hbs
+++ b/app/assets/javascripts/discourse/templates/topic.hbs
@@ -43,7 +43,7 @@
               {{/if}}
 
               {{#if details.can_edit}}
-                <a href='#' {{action "editTopic"}} class='edit-topic' title='{{i18n edit}}'>{{fa-icon pencil}}</a>
+                <a href='#' {{action "editTopic"}} class='edit-topic' title='{{i18n 'edit'}}'>{{fa-icon pencil}}</a>
               {{/if}}
             </h1>
 
@@ -97,7 +97,7 @@
 
             {{#if details.suggested_topics.length}}
               <div id='suggested-topics'>
-                <h3>{{i18n suggested_topics.title}}</h3>
+                <h3>{{i18n 'suggested_topics.title'}}</h3>
                 <div class='topics'>
                   {{basic-topic-list topics=details.suggested_topics postsAction="showTopicEntrance"}}
                 </div>
@@ -122,10 +122,10 @@
           <div>{{message}}</div>
           {{#if noRetry}}
             {{#unless currentUser}}
-              <button {{action "showLogin"}} class='btn btn-primary topic-retry'>{{fa-icon user}} {{i18n log_in}}</button>
+              <button {{action "showLogin"}} class='btn btn-primary topic-retry'>{{fa-icon user}} {{i18n 'log_in'}}</button>
             {{/unless}}
           {{else}}
-            <button class="btn btn-primary topic-retry" {{action "retryLoading"}}>{{fa-icon "refresh"}} {{i18n errors.buttons.again}}</button>
+            <button class="btn btn-primary topic-retry" {{action "retryLoading"}}>{{fa-icon "refresh"}} {{i18n 'errors.buttons.again'}}</button>
           {{/if}}
         </div>
         {{loading-spinner condition=retrying}}
diff --git a/app/assets/javascripts/discourse/templates/user-card.hbs b/app/assets/javascripts/discourse/templates/user-card.hbs
index c4326652f..f2412084a 100644
--- a/app/assets/javascripts/discourse/templates/user-card.hbs
+++ b/app/assets/javascripts/discourse/templates/user-card.hbs
@@ -23,27 +23,27 @@
 
   <ul class="usercard-controls">
     {{#if user.can_send_private_message_to_user}}
-      <li><a class='btn btn-primary' {{action "composePrivateMessage" user}}>{{fa-icon "envelope"}}{{i18n user.private_message}}</a></li>
+      <li><a class='btn btn-primary' {{action "composePrivateMessage" user}}>{{fa-icon "envelope"}}{{i18n 'user.private_message'}}</a></li>
     {{/if}}
 
     {{#if showFilter}}
-      <li><a class='btn' {{action "togglePosts" user}}>{{fa-icon "filter"}}{{i18n topic.filter_to username="username" post_count="participant.post_count"}}</a></li>
+      <li><a class='btn' {{action "togglePosts" user}}>{{fa-icon "filter"}}{{i18n 'topic.filter_to' username="username" post_count="participant.post_count"}}</a></li>
     {{/if}}
 
     {{#if hasUserFilters}}
-      <li><a class='btn' {{action "cancelFilter"}}>{{fa-icon "times"}}{{i18n topic.filters.cancel}}</a></li>
+      <li><a class='btn' {{action "cancelFilter"}}>{{fa-icon "times"}}{{i18n 'topic.filters.cancel'}}</a></li>
     {{/if}}
 
     {{#if showDelete}}
-      <li><a class='btn btn-danger' {{action "deleteUser" user}}>{{fa-icon "exclamation-triangle"}}{{i18n admin.user.delete}}</a></li>
+      <li><a class='btn btn-danger' {{action "deleteUser" user}}>{{fa-icon "exclamation-triangle"}}{{i18n 'admin.user.delete'}}</a></li>
     {{/if}}
   </ul>
 
   {{#if isSuspended}}
     <div class='suspended'>
       {{fa-icon "ban"}}
-      <b>{{i18n user.suspended_notice date="user.suspendedTillDate"}}</b><br/>
-      <b>{{i18n user.suspended_reason}}</b> {{user.suspend_reason}}
+      <b>{{i18n 'user.suspended_notice' date="user.suspendedTillDate"}}</b><br/>
+      <b>{{i18n 'user.suspended_reason'}}</b> {{user.suspend_reason}}
     </div>
   {{else}}
     {{#if user.bio_cooked}}<div class='bio'>{{text-overflow class="overflow" text=user.bio_cooked}}</div>{{/if}}
@@ -57,8 +57,8 @@
 
   {{#if user}}
     <div class="metadata">
-      <h3><span class='desc'>{{i18n last_post}}</span> {{format-date path="user.last_posted_at" leaveAgo="true"}}</h3>
-      <h3><span class='desc'>{{i18n joined}}</span> {{format-date path="user.created_at" leaveAgo="true"}}</h3>
+      <h3><span class='desc'>{{i18n 'last_post'}}</span> {{format-date path="user.last_posted_at" leaveAgo="true"}}</h3>
+      <h3><span class='desc'>{{i18n 'joined'}}</span> {{format-date path="user.created_at" leaveAgo="true"}}</h3>
     </div>
   {{/if}}
 
@@ -69,7 +69,7 @@
       {{/each}}
       {{#if showMoreBadges}}
         {{#link-to 'user.badges' user class="btn more-user-badges"}}
-          {{i18n badges.more_badges count=moreBadgesCount}}
+          {{i18n 'badges.more_badges' count=moreBadgesCount}}
         {{/link-to}}
       {{/if}}
     </div>
diff --git a/app/assets/javascripts/discourse/templates/user-dropdown.hbs b/app/assets/javascripts/discourse/templates/user-dropdown.hbs
index 2327c4e0d..9b3323d40 100644
--- a/app/assets/javascripts/discourse/templates/user-dropdown.hbs
+++ b/app/assets/javascripts/discourse/templates/user-dropdown.hbs
@@ -1,13 +1,13 @@
 <section class='d-dropdown' id='user-dropdown'>
   <ul class='user-dropdown-links'>
-    <li>{{#link-to 'user' currentUser class="user-activity-link" }}{{i18n user.profile}}{{/link-to}}</li>
+    <li>{{#link-to 'user' currentUser class="user-activity-link" }}{{i18n 'user.profile'}}{{/link-to}}</li>
     <li>
     {{#link-to 'userPrivateMessages.index' currentUser class='user-messages-link'}}
-      {{i18n user.unread_message_count}}{{#if currentUser.unread_private_messages}} <span class="badge-notification unread-private-messages">{{currentUser.unread_private_messages}}</span>{{/if}}
+      {{i18n 'user.unread_message_count'}}{{#if currentUser.unread_private_messages}} <span class="badge-notification unread-private-messages">{{currentUser.unread_private_messages}}</span>{{/if}}
     {{/link-to}}
     </li>
-    <li>{{#link-to 'userActivity.bookmarks' currentUser}}{{i18n user.bookmarks}}{{/link-to}}</li>
-    <li>{{#link-to 'preferences' currentUser}}{{i18n user.preferences}}{{/link-to}}</li>
-    <li><button {{action "logout"}} class='btn btn-danger right logout'><i class='fa fa-sign-out'></i>{{i18n user.log_out}}</button></li>
+    <li>{{#link-to 'userActivity.bookmarks' currentUser}}{{i18n 'user.bookmarks'}}{{/link-to}}</li>
+    <li>{{#link-to 'preferences' currentUser}}{{i18n 'user.preferences'}}{{/link-to}}</li>
+    <li><button {{action "logout"}} class='btn btn-danger right logout'><i class='fa fa-sign-out'></i>{{i18n 'user.log_out'}}</button></li>
   </ul>
 </section>
diff --git a/app/assets/javascripts/discourse/templates/user/about.hbs b/app/assets/javascripts/discourse/templates/user/about.hbs
index c535b10cf..5d24cf4d3 100644
--- a/app/assets/javascripts/discourse/templates/user/about.hbs
+++ b/app/assets/javascripts/discourse/templates/user/about.hbs
@@ -2,20 +2,20 @@
 
   <div class="control-group">
     <div class="controls">
-      <h3>{{i18n user.change_about.title}}</h3>
+      <h3>{{i18n 'user.change_about.title'}}</h3>
     </div>
   </div>
 
   {{#if error}}
     <div class="control-group">
       <div class="instructions">
-        <div class='alert alert-error'>{{i18n user.change_about.error}}</div>
+        <div class='alert alert-error'>{{i18n 'user.change_about.error'}}</div>
       </div>
     </div>
   {{/if}}
 
   <div class="control-group">
-    <label class="control-label">{{i18n user.bio}}</label>
+    <label class="control-label">{{i18n 'user.bio'}}</label>
     <div class="controls">
       {{pagedown-editor value=bio_raw}}
     </div>
@@ -24,7 +24,7 @@
   <div class="control-group">
     <div class="controls">
         <button {{action "changeAbout"}} {{bind-attr disabled="saveDisabled"}} class="btn btn-primary">{{saveButtonText}}</button>
-        {{#if saved}}{{i18n saved}}{{/if}}
+        {{#if saved}}{{i18n 'saved'}}{{/if}}
     </div>
   </div>
 
diff --git a/app/assets/javascripts/discourse/templates/user/badge-title.hbs b/app/assets/javascripts/discourse/templates/user/badge-title.hbs
index 0072c3fb6..d95f4ff77 100644
--- a/app/assets/javascripts/discourse/templates/user/badge-title.hbs
+++ b/app/assets/javascripts/discourse/templates/user/badge-title.hbs
@@ -3,7 +3,7 @@
 
     <div class="control-group">
       <div class="controls">
-        <h3>{{i18n badges.select_badge_for_title}}</h3>
+        <h3>{{i18n 'badges.select_badge_for_title'}}</h3>
       </div>
     </div>
 
@@ -17,7 +17,7 @@
     <div class="control-group">
       <div class="controls">
         <button class="btn btn-primary" {{bind-attr disabled=disableSave}} {{action "save"}}>{{savingStatus}}</button>
-        {{#if saved}}{{i18n saved}}{{/if}}
+        {{#if saved}}{{i18n 'saved'}}{{/if}}
       </div>
     </div>
 
diff --git a/app/assets/javascripts/discourse/templates/user/email.hbs b/app/assets/javascripts/discourse/templates/user/email.hbs
index 5f35acced..2a1a1bc76 100644
--- a/app/assets/javascripts/discourse/templates/user/email.hbs
+++ b/app/assets/javascripts/discourse/templates/user/email.hbs
@@ -3,14 +3,14 @@
 
     <div class="control-group">
       <div class="controls">
-        <h3>{{i18n user.change_email.title}}</h3>
+        <h3>{{i18n 'user.change_email.title'}}</h3>
       </div>
     </div>
 
     {{#if success}}
         <div class="control-group">
           <div class="instructions">
-            <p>{{i18n user.change_email.success}}</p>
+            <p>{{i18n 'user.change_email.success'}}</p>
           </div>
         </div>
     {{else}}
@@ -23,15 +23,15 @@
       {{/if}}
 
       <div class="control-group">
-        <label class="control-label">{{i18n user.email.title}}</label>
+        <label class="control-label">{{i18n 'user.email.title'}}</label>
         <div class="controls">
           {{text-field value=newEmail id="change_email" classNames="input-xxlarge"}}
         </div>
         <div class='instructions'>
           {{#if taken}}
-            {{i18n user.change_email.taken}}
+            {{i18n 'user.change_email.taken'}}
           {{else}}
-            {{i18n user.email.instructions}}
+            {{i18n 'user.email.instructions'}}
           {{/if}}
 
         </div>
diff --git a/app/assets/javascripts/discourse/templates/user/invited.hbs b/app/assets/javascripts/discourse/templates/user/invited.hbs
index f7679148c..cdc8b7836 100644
--- a/app/assets/javascripts/discourse/templates/user/invited.hbs
+++ b/app/assets/javascripts/discourse/templates/user/invited.hbs
@@ -1,10 +1,10 @@
 {{#if canInviteToForum}}
   <section class='user-content'>
 
-    <h2>{{i18n user.invited.title}}</h2>
+    <h2>{{i18n 'user.invited.title'}}</h2>
 
     <div class="pull-right">
-      <button {{action "showInvite"}} class='btn'>{{i18n user.invited.create}}</button>
+      <button {{action "showInvite"}} class='btn'>{{i18n 'user.invited.create'}}</button>
       {{#if canBulkInvite}}
         {{resumable-upload target="/invites/upload" success="uploadSuccess" error="uploadError" uploadText=uploadText}}
       {{/if}}
@@ -19,14 +19,14 @@
     {{#if model.invites}}
       <table class='table invite-list'>
         <tr>
-          <th>{{i18n user.invited.user}}</th>
-          <th>{{i18n user.invited.redeemed_at}}</th>
+          <th>{{i18n 'user.invited.user'}}</th>
+          <th>{{i18n 'user.invited.redeemed_at'}}</th>
           {{#if can_see_invite_details}}
-            <th>{{i18n user.last_seen}}</th>
-            <th>{{i18n user.invited.topics_entered}}</th>
-            <th>{{i18n user.invited.posts_read_count}}</th>
-            <th>{{i18n user.invited.time_read}}</th>
-            <th>{{i18n user.invited.days_visited}}</th>
+            <th>{{i18n 'user.last_seen'}}</th>
+            <th>{{i18n 'user.invited.topics_entered'}}</th>
+            <th>{{i18n 'user.invited.posts_read_count'}}</th>
+            <th>{{i18n 'user.invited.time_read'}}</th>
+            <th>{{i18n 'user.invited.days_visited'}}</th>
           {{/if}}
         </tr>
         {{#each invite in model.invites}}
@@ -42,27 +42,27 @@
                 <td>{{number invite.user.topics_entered}}</td>
                 <td>{{number invite.user.posts_read_count}}</td>
                 <td>{{{unbound invite.user.time_read}}}</td>
-                <td><span title="{{i18n user.invited.days_visited}}">{{{unbound invite.user.days_visited}}}</span>
+                <td><span title="{{i18n 'user.invited.days_visited'}}">{{{unbound invite.user.days_visited}}}</span>
                     /
-                  <span title="{{i18n user.invited.account_age_days}}">{{{unbound invite.user.days_since_created}}}</span></td>
+                  <span title="{{i18n 'user.invited.account_age_days'}}">{{{unbound invite.user.days_since_created}}}</span></td>
               {{/if}}
             {{else}}
               <td>{{unbound invite.email}}</td>
               <td colspan='6'>
                 {{#if invite.expired}}
-                  {{i18n user.invited.expired}}
+                  {{i18n 'user.invited.expired'}}
                   &nbsp;&nbsp;&nbsp;&nbsp;
                 {{/if}}
                 {{#if invite.rescinded}}
-                  {{i18n user.invited.rescinded}}
+                  {{i18n 'user.invited.rescinded'}}
                 {{else}}
-                  <button class='btn' {{action "rescind" invite}}><i class="fa fa-times"></i>{{i18n user.invited.rescind}}</button>
+                  <button class='btn' {{action "rescind" invite}}><i class="fa fa-times"></i>{{i18n 'user.invited.rescind'}}</button>
                 {{/if}}
                 &nbsp;&nbsp;&nbsp;&nbsp;
                 {{#if invite.reinvited}}
-                  {{i18n user.invited.reinvited}}
+                  {{i18n 'user.invited.reinvited'}}
                 {{else}}
-                  <button class='btn' {{action "reinvite" invite}}><i class="fa fa-envelope"></i>{{i18n user.invited.reinvite}}</button>
+                  <button class='btn' {{action "reinvite" invite}}><i class="fa fa-envelope"></i>{{i18n 'user.invited.reinvite'}}</button>
                 {{/if}}
               </td>
             {{/if}}
@@ -73,9 +73,9 @@
 
     {{else}}
       {{#if canBulkInvite}}
-        {{{i18n user.invited.bulk_invite.none}}}
+        {{{i18n 'user.invited.bulk_invite.none'}}}
       {{else}}
-        {{i18n user.invited.none}}
+        {{i18n 'user.invited.none'}}
       {{/if}}
     {{/if}}
 
diff --git a/app/assets/javascripts/discourse/templates/user/notifications.hbs b/app/assets/javascripts/discourse/templates/user/notifications.hbs
index 2a8816a57..1fe55c95f 100644
--- a/app/assets/javascripts/discourse/templates/user/notifications.hbs
+++ b/app/assets/javascripts/discourse/templates/user/notifications.hbs
@@ -1,16 +1,16 @@
 {{#if model.error}}
   <div class="item error">
     {{#if model.forbidden}}
-      {{i18n errors.reasons.forbidden}}
+      {{i18n 'errors.reasons.forbidden'}}
     {{else}}
-      {{i18n errors.desc.unknown}}
+      {{i18n 'errors.desc.unknown'}}
     {{/if}}
   </div>
 {{/if}}
 
 {{#if showDismissButton}}
   <div class='notification-buttons'>
-    <button title="{{i18n user.dismiss_notifications_tooltip}}" id='dismiss-notifications-top' class='btn notifications-read' {{action "resetNew"}}>{{i18n user.dismiss_notifications}}</button>
+    <button title="{{i18n 'user.dismiss_notifications_tooltip'}}" id='dismiss-notifications-top' class='btn notifications-read' {{action "resetNew"}}>{{i18n 'user.dismiss_notifications'}}</button>
   </div>
 {{/if}}
 
@@ -27,7 +27,7 @@
   {{#unless canLoadMore}}
     {{#if showDismissButton}}
       <div class='notification-buttons'>
-        <button title="{{i18n user.dismiss_notifications_tooltip}}" id='dismiss-notifications' class='btn notifications-read' {{action "resetNew"}}>{{i18n user.dismiss_notifications}}</button>
+        <button title="{{i18n 'user.dismiss_notifications_tooltip'}}" id='dismiss-notifications' class='btn notifications-read' {{action "resetNew"}}>{{i18n 'user.dismiss_notifications'}}</button>
       </div>
     {{/if}}
   {{/unless}}
diff --git a/app/assets/javascripts/discourse/templates/user/preferences.hbs b/app/assets/javascripts/discourse/templates/user/preferences.hbs
index 7e7e09931..2e6dd5cbc 100644
--- a/app/assets/javascripts/discourse/templates/user/preferences.hbs
+++ b/app/assets/javascripts/discourse/templates/user/preferences.hbs
@@ -9,7 +9,7 @@
     </div>
 
     <div class="control-group pref-username">
-      <label class="control-label">{{i18n user.username.title}}</label>
+      <label class="control-label">{{i18n 'user.username.title'}}</label>
       <div class="controls">
         <span class='static'>{{username}}</span>
         {{#if can_edit_username}}
@@ -17,13 +17,13 @@
         {{/if}}
       </div>
       <div class='instructions'>
-        {{{i18n user.username.short_instructions username="username"}}}
+        {{{i18n 'user.username.short_instructions' username="username"}}}
       </div>
     </div>
 
     {{#if canEditName}}
       <div class="control-group pref-name">
-        <label class="control-label">{{i18n user.name.title}}</label>
+        <label class="control-label">{{i18n 'user.name.title'}}</label>
         <div class="controls">
           {{#if can_edit_name}}
             {{text-field value=newNameInput classNames="input-xxlarge"}}
@@ -32,14 +32,14 @@
           {{/if}}
         </div>
         <div class='instructions'>
-          {{i18n user.name.instructions}}
+          {{i18n 'user.name.instructions'}}
         </div>
       </div>
     {{/if}}
 
     {{#if canSelectTitle}}
       <div class="control-group pref-title">
-        <label class="control-label">{{i18n user.title.title}}</label>
+        <label class="control-label">{{i18n 'user.title.title'}}</label>
         <div class="controls">
           <span class="static">{{title}}</span>
           {{#link-to "preferences.badgeTitle" class="btn btn-small pad-left no-text"}}{{fa-icon "pencil"}}{{/link-to}}
@@ -49,7 +49,7 @@
 
     {{#if canCheckEmails}}
       <div class="control-group pref-email">
-        <label class="control-label">{{i18n user.email.title}}</label>
+        <label class="control-label">{{i18n 'user.email.title'}}</label>
         {{#if email}}
           <div class="controls">
             <span class='static'>{{email}}</span>
@@ -58,11 +58,11 @@
             {{/if}}
           </div>
           <div class='instructions'>
-            {{i18n user.email.instructions}}
+            {{i18n 'user.email.instructions'}}
           </div>
         {{else}}
           <div class="controls">
-            <button class="btn" title="{{i18n admin.users.check_email.title}}" {{action "checkEmail" this}}>{{fa-icon "envelope-o"}} {{i18n admin.users.check_email.text}}</button>
+            <button class="btn" title="{{i18n 'admin.users.check_email.title'}}" {{action "checkEmail" this}}>{{fa-icon "envelope-o"}} {{i18n 'admin.users.check_email.text'}}</button>
           </div>
         {{/if}}
       </div>
@@ -70,13 +70,13 @@
 
     {{#if canChangePassword}}
     <div class="control-group pref-password">
-      <label class="control-label">{{i18n user.password.title}}</label>
+      <label class="control-label">{{i18n 'user.password.title'}}</label>
       <div class="controls">
         <a href="#" {{action "changePassword"}} class='btn'><i class="fa fa-envelope"></i>
           {{#if no_password}}
-            {{i18n user.change_password.set_password}}
+            {{i18n 'user.change_password.set_password'}}
           {{else}}
-            {{i18n user.change_password.action}}
+            {{i18n 'user.change_password.action'}}
           {{/if}}
         </a>
         {{passwordProgress}}
@@ -85,20 +85,20 @@
     {{/if}}
 
     <div class="control-group pref-avatar">
-      <label class="control-label">{{i18n user.avatar.title}}</label>
+      <label class="control-label">{{i18n 'user.avatar.title'}}</label>
       <div class="controls">
         {{bound-avatar model "large"}}
         {{#if allowAvatarUpload}}
           <button {{action "showAvatarSelector"}} class="btn pad-left no-text"><i class="fa fa-pencil"></i></button>
         {{else}} {{#unless ssoOverridesAvatar}}
-          <a href="//gravatar.com/emails" target="_blank" title="{{i18n user.change_avatar.gravatar_title}}" class="btn no-text"><i class="fa fa-pencil"></i></a>
+          <a href="//gravatar.com/emails" target="_blank" title="{{i18n 'user.change_avatar.gravatar_title'}}" class="btn no-text"><i class="fa fa-pencil"></i></a>
         {{/unless}} {{/if}}
       </div>
     </div>
 
     {{#if allowBackgrounds}}
       <div class="control-group pref-profile-bg">
-        <label class="control-label">{{i18n user.change_profile_background.title}}</label>
+        <label class="control-label">{{i18n 'user.change_profile_background.title'}}</label>
         <div class="controls">
           {{image-uploader uploadUrl=imageUploadUrl
                            imageUrl=profile_background
@@ -106,12 +106,12 @@
                            type="profile_background"}}
         </div>
         <div class='instructions'>
-          {{i18n user.change_profile_background.instructions}}
+          {{i18n 'user.change_profile_background.instructions'}}
         </div>
       </div>
 
       <div class="control-group pref-profile-bg">
-        <label class="control-label">{{i18n user.change_card_background.title}}</label>
+        <label class="control-label">{{i18n 'user.change_card_background.title'}}</label>
         <div class="controls">
           {{image-uploader uploadUrl=imageUploadUrl
                            imageUrl=card_background
@@ -119,46 +119,46 @@
                            type="card_background"}}
         </div>
         <div class='instructions'>
-          {{i18n user.change_card_background.instructions}}
+          {{i18n 'user.change_card_background.instructions'}}
         </div>
       </div>
     {{/if}}
 
     {{#if allowUserLocale}}
       <div class="control-group pref-locale">
-        <label class="control-label">{{i18n user.locale.title}}</label>
+        <label class="control-label">{{i18n 'user.locale.title'}}</label>
         <div class="controls">
           {{combo-box valueAttribute="value" content=availableLocales value=locale none="user.locale.default"}}
         </div>
         <div class='instructions'>
-          {{i18n user.locale.instructions}}
+          {{i18n 'user.locale.instructions'}}
         </div>
       </div>
     {{/if}}
 
     <div class="control-group pref-bio">
-      <label class="control-label">{{i18n user.bio}}</label>
+      <label class="control-label">{{i18n 'user.bio'}}</label>
       <div class="controls bio-composer">
         {{pagedown-editor value=bio_raw}}
       </div>
     </div>
 
     <div class="control-group pref-location">
-      <label class="control-label">{{i18n user.location}}</label>
+      <label class="control-label">{{i18n 'user.location'}}</label>
       <div class="controls">
         {{input type="text" value=location class="input-xxlarge"}}
       </div>
     </div>
 
     <div class="control-group pref-website">
-      <label class="control-label">{{i18n user.website}}</label>
+      <label class="control-label">{{i18n 'user.website'}}</label>
       <div class="controls">
         {{input type="text" value=website class="input-xxlarge"}}
       </div>
     </div>
 
     <div class="control-group pref-card-badge">
-      <label class="control-label">{{i18n user.card_badge.title}}</label>
+      <label class="control-label">{{i18n 'user.card_badge.title'}}</label>
       <div class="controls">
         {{#if card_image_badge}}
           {{icon-or-image card_image_badge}}
@@ -168,7 +168,7 @@
     </div>
 
     <div class="control-group pref-email-settings">
-      <label class="control-label">{{i18n user.email_settings}}</label>
+      <label class="control-label">{{i18n 'user.email_settings'}}</label>
       {{preference-checkbox labelKey="user.email_digests.title" checked=email_digests}}
       {{#if email_digests}}
         <div class='controls controls-dropdown'>
@@ -181,19 +181,19 @@
       {{preference-checkbox labelKey="user.email_always" checked=email_always}}
 
       <div class='instructions'>
-        {{i18n user.email.frequency count=siteSettings.email_time_window_mins}}
+        {{i18n 'user.email.frequency' count=siteSettings.email_time_window_mins}}
       </div>
     </div>
 
     <div class="control-group other">
-      <label class="control-label">{{i18n user.other_settings}}</label>
+      <label class="control-label">{{i18n 'user.other_settings'}}</label>
       <div class="controls controls-dropdown">
-        <label>{{i18n user.auto_track_topics}}</label>
+        <label>{{i18n 'user.auto_track_topics'}}</label>
         {{combo-box valueAttribute="value" content=autoTrackDurations value=auto_track_topics_after_msecs}}
       </div>
 
       <div class="controls controls-dropdown">
-        <label>{{i18n user.new_topic_duration.label}}</label>
+        <label>{{i18n 'user.new_topic_duration.label'}}</label>
         {{combo-box valueAttribute="value" content=considerNewTopicOptions value=new_topic_duration_minutes}}
       </div>
 
@@ -213,22 +213,22 @@
     {{/each}}
 
     <div class="control-group category">
-      <label class="control-label">{{i18n user.categories_settings}}</label>
+      <label class="control-label">{{i18n 'user.categories_settings'}}</label>
       <div class="controls category-controls">
-        <label>{{i18n user.watched_categories}}</label>
+        <label>{{i18n 'user.watched_categories'}}</label>
         {{category-group categories=watchedCategories blacklist=selectedCategories}}
       </div>
-      <div class="instructions">{{i18n user.watched_categories_instructions}}</div>
+      <div class="instructions">{{i18n 'user.watched_categories_instructions'}}</div>
       <div class="controls category-controls">
-        <label>{{i18n user.tracked_categories}}</label>
+        <label>{{i18n 'user.tracked_categories'}}</label>
         {{category-group categories=trackedCategories blacklist=selectedCategories}}
       </div>
-      <div class="instructions">{{i18n user.tracked_categories_instructions}}</div>
+      <div class="instructions">{{i18n 'user.tracked_categories_instructions'}}</div>
       <div class="controls category-controls">
-        <label>{{i18n user.muted_categories}}</label>
+        <label>{{i18n 'user.muted_categories'}}</label>
         {{category-group categories=mutedCategories blacklist=selectedCategories}}
       </div>
-      <div class="instructions">{{i18n user.muted_categories_instructions}}</div>
+      <div class="instructions">{{i18n 'user.muted_categories_instructions'}}</div>
     </div>
 
     <div class="control-group">
@@ -241,7 +241,7 @@
       <div class="control-group delete-account">
         <hr/>
         <div class="controls">
-            <button {{action "delete"}} {{bind-attr disabled="deleteDisabled"}} class="btn btn-danger"><i class="fa fa-trash-o"></i> {{i18n user.delete_account}}</button>
+            <button {{action "delete"}} {{bind-attr disabled="deleteDisabled"}} class="btn btn-danger"><i class="fa fa-trash-o"></i> {{i18n 'user.delete_account'}}</button>
         </div>
       </div>
     {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/user/preferences/_save_button.hbs b/app/assets/javascripts/discourse/templates/user/preferences/_save_button.hbs
index 5437e4d35..cc18c3efb 100644
--- a/app/assets/javascripts/discourse/templates/user/preferences/_save_button.hbs
+++ b/app/assets/javascripts/discourse/templates/user/preferences/_save_button.hbs
@@ -1,2 +1,2 @@
 <button {{action "save"}} {{bind-attr disabled="saving"}} class="btn btn-primary">{{saveButtonText}}</button>
-{{#if saved}}{{i18n saved}}{{/if}}
+{{#if saved}}{{i18n 'saved'}}{{/if}}
diff --git a/app/assets/javascripts/discourse/templates/user/user.hbs b/app/assets/javascripts/discourse/templates/user/user.hbs
index a12eb5946..3f60aa312 100644
--- a/app/assets/javascripts/discourse/templates/user/user.hbs
+++ b/app/assets/javascripts/discourse/templates/user/user.hbs
@@ -8,27 +8,27 @@
     <section {{bind-attr class="collapsedInfo :about profileBackground:has-background:no-background"}}  {{bind-attr style="profileBackground"}}>
     <div class='staff-counters'>
       {{#if number_of_flags_given}}
-        <div><span class="helpful-flags">{{number_of_flags_given}}</span>&nbsp;{{i18n user.staff_counters.flags_given}}</div>
+        <div><span class="helpful-flags">{{number_of_flags_given}}</span>&nbsp;{{i18n 'user.staff_counters.flags_given'}}</div>
       {{/if}}
       {{#if number_of_flagged_posts}}
         <div>
           {{#link-to 'user.flaggedPosts' this}}
-            <span class="flagged-posts">{{number_of_flagged_posts}}</span>&nbsp;{{i18n user.staff_counters.flagged_posts}}
+            <span class="flagged-posts">{{number_of_flagged_posts}}</span>&nbsp;{{i18n 'user.staff_counters.flagged_posts'}}
           {{/link-to}}
         </div>
       {{/if}}
       {{#if number_of_deleted_posts}}
         <div>
           {{#link-to 'user.deletedPosts' this}}
-            <span class="deleted-posts">{{number_of_deleted_posts}}</span>&nbsp;{{i18n user.staff_counters.deleted_posts}}
+            <span class="deleted-posts">{{number_of_deleted_posts}}</span>&nbsp;{{i18n 'user.staff_counters.deleted_posts'}}
           {{/link-to}}
         </div>
       {{/if}}
       {{#if number_of_suspensions}}
-        <div><span class="suspensions">{{number_of_suspensions}}</span>&nbsp;{{i18n user.staff_counters.suspensions}}</div>
+        <div><span class="suspensions">{{number_of_suspensions}}</span>&nbsp;{{i18n 'user.staff_counters.suspensions'}}</div>
       {{/if}}
       {{#if number_of_warnings}}
-        <div><span class="warnings-received">{{number_of_warnings}}</span>&nbsp;{{i18n user.staff_counters.warnings_received}}</div>
+        <div><span class="warnings-received">{{number_of_warnings}}</span>&nbsp;{{i18n 'user.staff_counters.warnings_received'}}</div>
       {{/if}}
     </div>
       <div class='profile-image'></div>
@@ -41,21 +41,21 @@
               <li>
                 <a class='btn btn-primary right' {{action "composePrivateMessage" model}}>
                   {{fa-icon "envelope"}}
-                  {{i18n user.private_message}}
+                  {{i18n 'user.private_message'}}
                 </a>
               </li>
               {{/if}}
               {{#if viewingSelf}}
-                <li><a {{action "logout"}} class='btn btn-danger right'>{{fa-icon "sign-out"}}{{i18n user.log_out}}</a></li>
+                <li><a {{action "logout"}} class='btn btn-danger right'>{{fa-icon "sign-out"}}{{i18n 'user.log_out'}}</a></li>
               {{/if}}
               {{#if currentUser.staff}}
-                <li><a {{bind-attr href="adminPath"}} class='btn right'>{{fa-icon "wrench"}}{{i18n admin.user.show_admin_profile}}</a></li>
+                <li><a {{bind-attr href="adminPath"}} class='btn right'>{{fa-icon "wrench"}}{{i18n 'admin.user.show_admin_profile'}}</a></li>
               {{/if}}
               {{#if can_edit}}
-                <li>{{#link-to 'preferences' class="btn right"}}{{fa-icon "cog"}}{{i18n user.preferences}}{{/link-to}}</li>
+                <li>{{#link-to 'preferences' class="btn right"}}{{fa-icon "cog"}}{{i18n 'user.preferences'}}{{/link-to}}</li>
               {{/if}}
               {{#if canInviteToForum}}
-                <li>{{#link-to 'user.invited' class="btn right"}}{{fa-icon "envelope-o"}}{{i18n user.invited.title}}{{/link-to}}</li>
+                <li>{{#link-to 'user.invited' class="btn right"}}{{fa-icon "envelope-o"}}{{i18n 'user.invited.title'}}{{/link-to}}</li>
               {{/if}}
             </ul>
           </section>
@@ -79,8 +79,8 @@
               {{#if isSuspended}}
                 <div class='suspended'>
                   {{fa-icon "ban"}}
-                  <b>{{i18n user.suspended_notice date="suspendedTillDate"}}</b><br/>
-                  <b>{{i18n user.suspended_reason}}</b> {{suspend_reason}}
+                  <b>{{i18n 'user.suspended_notice' date="suspendedTillDate"}}</b><br/>
+                  <b>{{i18n 'user.suspended_reason'}}</b> {{suspend_reason}}
                 </div>
               {{/if}}
               {{{bio_cooked}}}
@@ -96,30 +96,30 @@
       <div class='secondary'>
         <dl>
           {{#if created_at}}
-            <dt>{{i18n user.created}}</dt><dd>{{bound-date created_at}}</dd>
+            <dt>{{i18n 'user.created'}}</dt><dd>{{bound-date created_at}}</dd>
           {{/if}}
           {{#if last_posted_at}}
-            <dt>{{i18n user.last_posted}}</dt><dd>{{bound-date last_posted_at}}</dd>
+            <dt>{{i18n 'user.last_posted'}}</dt><dd>{{bound-date last_posted_at}}</dd>
           {{/if}}
           {{#if last_seen_at}}
-            <dt>{{i18n user.last_seen}}</dt><dd>{{bound-date last_seen_at}}</dd>
+            <dt>{{i18n 'user.last_seen'}}</dt><dd>{{bound-date last_seen_at}}</dd>
           {{/if}}
           {{#if invited_by}}
-            <dt>{{i18n user.invited_by}}</dt><dd>{{#link-to 'user' invited_by}}{{invited_by.username}}{{/link-to}}</dd>
+            <dt>{{i18n 'user.invited_by'}}</dt><dd>{{#link-to 'user' invited_by}}{{invited_by.username}}{{/link-to}}</dd>
           {{/if}}
-          <dt>{{i18n user.trust_level}}</dt><dd>{{trustLevel.name}}</dd>
+          <dt>{{i18n 'user.trust_level'}}</dt><dd>{{trustLevel.name}}</dd>
           {{#if canCheckEmails}}
-            <dt>{{i18n user.email.title}}</dt>
+            <dt>{{i18n 'user.email.title'}}</dt>
             <dd {{bind-attr title="email"}}>
               {{#if email}}
                 {{email}}
               {{else}}
-                <button class="btn btn-primary" title="{{i18n admin.users.check_email.title}}" {{action "checkEmail" this}}>{{fa-icon "envelope-o"}} {{i18n admin.users.check_email.text}}</button>
+                <button class="btn btn-primary" title="{{i18n 'admin.users.check_email.title'}}" {{action "checkEmail" this}}>{{fa-icon "envelope-o"}} {{i18n 'admin.users.check_email.text'}}</button>
               {{/if}}
             </dd>
           {{/if}}
           {{#if custom_groups}}
-            <dt>{{i18n groups.title count=custom_groups.length}}</dt>
+            <dt>{{i18n 'groups.title' count=custom_groups.length}}</dt>
             <dd class='groups'>
               {{#each custom_groups}}
                 <span>{{#link-to 'group' this class="group-link"}}{{name}}{{/link-to}}</span>
@@ -129,7 +129,7 @@
           {{#if canDeleteUser}}
             <button class="btn btn-danger" {{action "adminDelete"}}>
               <i class="fa fa-exclamation-triangle"></i>
-              {{i18n user.admin_delete}}
+              {{i18n 'user.admin_delete'}}
             </button>
           {{/if}}
         </dl>
@@ -147,7 +147,7 @@
           {{#link-to 'user.badges' tagName="li"}}
             {{#link-to 'user.badges'}}
               <i class='glyph fa fa-certificate'></i>
-              {{i18n badges.title}}
+              {{i18n 'badges.title'}}
               <span class='count'>({{badge_count}})</span>
             {{/link-to}}
           {{/link-to}}
@@ -156,7 +156,7 @@
           {{#link-to 'user.notifications' tagName="li"}}
             {{#link-to 'user.notifications'}}
               <i class='glyph fa fa-comment'></i>
-              {{i18n user.notifications}}
+              {{i18n 'user.notifications'}}
               <span class='count'>({{notification_count}})</span>
             {{/link-to}}
           {{/link-to}}
@@ -164,23 +164,23 @@
       </ul>
 
       {{#if canSeePrivateMessages}}
-        <h3>{{fa-icon "envelope"}} {{i18n user.private_messages}}</h3>
+        <h3>{{fa-icon "envelope"}} {{i18n 'user.private_messages'}}</h3>
         <ul class='action-list nav-stacked'>
           <li {{bind-attr class=":noGlyph privateMessagesActive:active"}}>
             {{#link-to 'userPrivateMessages.index' model}}
-              {{i18n user.messages.all}}
+              {{i18n 'user.messages.all'}}
               {{#if hasPMs}}<span class='count'>({{private_messages_stats.all}})</span>{{/if}}
             {{/link-to}}
           </li>
           <li {{bind-attr class=":noGlyph privateMessagesMineActive:active"}}>
             {{#link-to 'userPrivateMessages.mine' model}}
-              {{i18n user.messages.mine}}
+              {{i18n 'user.messages.mine'}}
               {{#if hasStartedPMs}}<span class='count'>({{private_messages_stats.mine}})</span>{{/if}}
             {{/link-to}}
           </li>
           <li {{bind-attr class=":noGlyph privateMessagesUnreadActive:active"}}>
             {{#link-to 'userPrivateMessages.unread' model}}
-              {{i18n user.messages.unread}}
+              {{i18n 'user.messages.unread'}}
               {{#if hasUnreadPMs}}<span class='badge-notification unread-private-messages'>{{private_messages_stats.unread}}</span>{{/if}}
             {{/link-to}}
           </li>
diff --git a/app/assets/javascripts/discourse/templates/user/username.hbs b/app/assets/javascripts/discourse/templates/user/username.hbs
index bf392c4b1..cc2f97c59 100644
--- a/app/assets/javascripts/discourse/templates/user/username.hbs
+++ b/app/assets/javascripts/discourse/templates/user/username.hbs
@@ -3,26 +3,26 @@
 
     <div class="control-group">
       <div class="controls">
-        <h3>{{i18n user.change_username.title}}</h3>
+        <h3>{{i18n 'user.change_username.title'}}</h3>
       </div>
     </div>
 
     {{#if error}}
       <div class="control-group">
         <div class="instructions">
-          <div class='alert alert-error'>{{i18n user.change_username.error}}</div>
+          <div class='alert alert-error'>{{i18n 'user.change_username.error'}}</div>
         </div>
       </div>
     {{/if}}
 
     <div class="control-group">
-      <label class="control-label">{{i18n user.username.title}}</label>
+      <label class="control-label">{{i18n 'user.username.title'}}</label>
       <div class="controls">
         {{text-field value=newUsername id="change_username" classNames="input-xxlarge" maxlength=maxLength}}
       </div>
       <div class='instructions'>
         {{#if taken}}
-          {{i18n user.change_username.taken}}
+          {{i18n 'user.change_username.taken'}}
         {{/if}}
         <span>{{ errorMessage }}</span>
       </div>
@@ -31,7 +31,7 @@
     <div class="control-group">
       <div class="controls">
           <button {{action "changeUsername"}} {{bind-attr disabled="saveDisabled"}} class="btn btn-primary">{{saveButtonText}}</button>
-          {{#if saved}}{{i18n saved}}{{/if}}
+          {{#if saved}}{{i18n 'saved'}}{{/if}}
       </div>
     </div>
 
diff --git a/plugins/poll/assets/javascripts/discourse/templates/poll.hbs b/plugins/poll/assets/javascripts/discourse/templates/poll.hbs
index 7d26c141d..96cf735f5 100644
--- a/plugins/poll/assets/javascripts/discourse/templates/poll.hbs
+++ b/plugins/poll/assets/javascripts/discourse/templates/poll.hbs
@@ -7,7 +7,7 @@
       <td class="option">
         <div class="option">{{{option}}}</div>
         {{#if controller.showResults}}
-          <div class="result">{{i18n poll.voteCount count=votes}}</div>
+          <div class="result">{{i18n 'poll.voteCount' count=votes}}</div>
         {{/if}}
       </td>
     </tr>
@@ -18,10 +18,10 @@
 <button {{action "toggleShowResults"}} class="btn btn-small show-results">
   {{#if showResults}}
     <i class="fa fa-eye-slash"></i>
-    {{i18n poll.results.hide}}
+    {{i18n 'poll.results.hide'}}
   {{else}}
     <i class="fa fa-eye"></i>
-    {{i18n poll.results.show}}
+    {{i18n 'poll.results.show'}}
   {{/if}}
 </button>
 
@@ -29,10 +29,10 @@
   <button {{action "toggleClosePoll"}} class="btn btn-small toggle-poll">
     {{#if poll.closed}}
       <i class="fa fa-unlock-alt"></i>
-      {{i18n poll.open_poll}}
+      {{i18n 'poll.open_poll'}}
     {{else}}
       <i class="fa fa-lock"></i>
-      {{i18n poll.close_poll}}
+      {{i18n 'poll.close_poll'}}
     {{/if}}
   </button>
 {{/if}}