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

The {{i18n}} helper should use quotes when looking up keys, always.

Browse source
This commit is contained in:
Robin Ward 2014-12-08 16:35:49 -05:00
parent 63d4932549
commit 4de412365e
141 changed files with 928 additions and 924 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
app/assets/javascripts/admin/templates/admin.hbs
View file

@ -4,24 +4,24 @@
<div class="full-width"> <div class="full-width">
<ul class="nav nav-pills"> <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}} {{#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}} {{/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}} {{#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}}
{{#if currentUser.admin}} {{#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}} {{/if}}
<li>{{#link-to 'adminEmail'}}{{i18n admin.email.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 'adminFlags'}}{{i18n 'admin.flags.title'}}{{/link-to}}</li>
<li>{{#link-to 'adminLogs'}}{{i18n admin.logs.title}}{{/link-to}}</li> <li>{{#link-to 'adminLogs'}}{{i18n 'admin.logs.title'}}{{/link-to}}</li>
{{#if currentUser.admin}} {{#if currentUser.admin}}
<li>{{#link-to 'adminCustomize.colors'}}{{i18n admin.customize.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.api'}}{{i18n 'admin.api.title'}}{{/link-to}}</li>
<li>{{#link-to 'admin.backups'}}{{i18n admin.backups.title}}{{/link-to}}</li> <li>{{#link-to 'admin.backups'}}{{i18n 'admin.backups.title'}}{{/link-to}}</li>
{{/if}} {{/if}}
</ul> </ul>

14
app/assets/javascripts/admin/templates/api.hbs
View file

@ -1,8 +1,8 @@
{{#if model}} {{#if model}}
<table class='api-keys'> <table class='api-keys'>
<tr> <tr>
<th>{{i18n admin.api.key}}</th> <th>{{i18n 'admin.api.key'}}</th>
<th>{{i18n admin.api.user}}</th> <th>{{i18n 'admin.api.user'}}</th>
<th>&nbsp;</th> <th>&nbsp;</th>
</tr> </tr>
{{#each model}} {{#each model}}
@ -14,20 +14,20 @@
{{avatar user imageSize="small"}} {{avatar user imageSize="small"}}
{{/link-to}} {{/link-to}}
{{else}} {{else}}
{{i18n admin.api.all_users}} {{i18n 'admin.api.all_users'}}
{{/if}} {{/if}}
</td> </td>
<td> <td>
<button class='btn' {{action "regenerateKey" this}}><i class="fa fa-undo"></i>{{i18n admin.api.regenerate}}</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> <button class='btn' {{action "revokeKey" this}}><i class="fa fa-times"></i>{{i18n 'admin.api.revoke'}}</button>
</td> </td>
</tr> </tr>
{{/each}} {{/each}}
</table> </table>
{{else}} {{else}}
<p>{{i18n admin.api.none}}</p> <p>{{i18n 'admin.api.none'}}</p>
{{/if}} {{/if}}
{{#unless hasMasterKey}} {{#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 }} {{/unless }}

10
app/assets/javascripts/admin/templates/backups.hbs
View file

@ -1,18 +1,18 @@
<div class="admin-controls"> <div class="admin-controls">
<div class="span15"> <div class="span15">
<ul class="nav nav-pills"> <ul class="nav nav-pills">
<li>{{#link-to "admin.backups.index"}}{{i18n admin.backups.menu.backups}}{{/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> <li>{{#link-to "admin.backups.logs"}}{{i18n 'admin.backups.menu.logs'}}{{/link-to}}</li>
</ul> </ul>
</div> </div>
<div class="pull-right"> <div class="pull-right">
{{#if canRollback}} {{#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}}
{{#if isOperationRunning}} {{#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}} {{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}} {{/if}}
</div> </div>
</div> </div>

10
app/assets/javascripts/admin/templates/backups_index.hbs
View file

@ -1,7 +1,7 @@
<table> <table>
<tr> <tr>
<th width="55%">{{i18n admin.backups.columns.filename}}</th> <th width="55%">{{i18n 'admin.backups.columns.filename'}}</th>
<th width="10%">{{i18n admin.backups.columns.size}}</th> <th width="10%">{{i18n 'admin.backups.columns.size'}}</th>
<th> <th>
<div class="pull-right"> <div class="pull-right">
{{resumable-upload target="/admin/backups/upload" success="uploadSuccess" error="uploadError" uploadText=uploadText}} {{resumable-upload target="/admin/backups/upload" success="uploadSuccess" error="uploadError" uploadText=uploadText}}
@ -15,15 +15,15 @@
<td>{{human-size backup.size}}</td> <td>{{human-size backup.size}}</td>
<td> <td>
<div class="pull-right"> <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 "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> </div>
</td> </td>
</tr> </tr>
{{else}} {{else}}
<tr> <tr>
<td>{{i18n admin.backups.none}}</td> <td>{{i18n 'admin.backups.none'}}</td>
<td></td> <td></td>
<td></td> <td></td>
</tr> </tr>

4
app/assets/javascripts/admin/templates/badges-index.hbs
View file

@ -1,9 +1,9 @@
<div class='span13'> <div class='span13'>
<p>{{i18n admin.badges.none_selected}}</p> <p>{{i18n 'admin.badges.none_selected'}}</p>
<div> <div>
{{#link-to 'adminBadges.show' 'new' class="btn"}} {{#link-to 'adminBadges.show' 'new' class="btn"}}
{{fa-icon "plus"}} {{i18n admin.badges.new}} {{fa-icon "plus"}} {{i18n 'admin.badges.new'}}
{{/link-to}} {{/link-to}}
</div> </div>
</div> </div>

48
app/assets/javascripts/admin/templates/badges-show.hbs
View file

@ -1,31 +1,31 @@
<div class='current-badge span13'> <div class='current-badge span13'>
<form class="form-horizontal"> <form class="form-horizontal">
<div> <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}} {{input type="text" name="name" value=buffered.name}}
</div> </div>
{{#if showDisplayName}} {{#if showDisplayName}}
<div> <div>
<strong>{{i18n admin.badges.display_name}}</strong> <strong>{{i18n 'admin.badges.display_name'}}</strong>
{{buffered.displayName}} {{buffered.displayName}}
</div> </div>
{{/if}} {{/if}}
<div> <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}} {{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>
<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}} {{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>
<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" {{view Ember.Select name="badge_type_id"
value=buffered.badge_type_id value=buffered.badge_type_id
content=badgeTypes content=badgeTypes
@ -35,7 +35,7 @@
</div> </div>
<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" {{view Ember.Select name="badge_grouping_id"
value=buffered.badge_grouping_id value=buffered.badge_grouping_id
content=badgeGroupings content=badgeGroupings
@ -46,7 +46,7 @@
<div> <div>
<label for="description">{{i18n admin.badges.description}}</label> <label for="description">{{i18n 'admin.badges.description'}}</label>
{{#if canEditDescription}} {{#if canEditDescription}}
{{textarea name="description" value=buffered.description}} {{textarea name="description" value=buffered.description}}
{{else}} {{else}}
@ -55,34 +55,34 @@
</div> </div>
<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}} {{textarea name="query" value=buffered.query disabled=readOnly}}
</div> </div>
{{#if hasQuery}} {{#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}} {{#if preview_loading}}
{{i18n loading}}... {{i18n 'loading'}}...
{{/if}} {{/if}}
<div> <div>
<label> <label>
{{input type="checkbox" checked=buffered.auto_revoke disabled=readOnly}} {{input type="checkbox" checked=buffered.auto_revoke disabled=readOnly}}
{{i18n admin.badges.auto_revoke}} {{i18n 'admin.badges.auto_revoke'}}
</label> </label>
</div> </div>
<div> <div>
<label> <label>
{{input type="checkbox" checked=buffered.target_posts disabled=readOnly}} {{input type="checkbox" checked=buffered.target_posts disabled=readOnly}}
{{i18n admin.badges.target_posts}} {{i18n 'admin.badges.target_posts'}}
</label> </label>
</div> </div>
<div> <div>
<label for="trigger">{{i18n admin.badges.trigger}}</label> <label for="trigger">{{i18n 'admin.badges.trigger'}}</label>
{{view Ember.Select name="trigger" {{view Ember.Select name="trigger"
value=buffered.trigger value=buffered.trigger
content=badgeTriggers content=badgeTriggers
@ -95,43 +95,43 @@
<div> <div>
<label> <label>
{{input type="checkbox" checked=buffered.allow_title}} {{input type="checkbox" checked=buffered.allow_title}}
{{i18n admin.badges.allow_title}} {{i18n 'admin.badges.allow_title'}}
</label> </label>
</div> </div>
<div> <div>
<label> <label>
{{input type="checkbox" checked=buffered.multiple_grant disabled=readOnly}} {{input type="checkbox" checked=buffered.multiple_grant disabled=readOnly}}
{{i18n admin.badges.multiple_grant}} {{i18n 'admin.badges.multiple_grant'}}
</label> </label>
</div> </div>
<div> <div>
<label> <label>
{{input type="checkbox" checked=buffered.listable disabled=readOnly}} {{input type="checkbox" checked=buffered.listable disabled=readOnly}}
{{i18n admin.badges.listable}} {{i18n 'admin.badges.listable'}}
</label> </label>
</div> </div>
<div> <div>
<label> <label>
{{input type="checkbox" checked=buffered.show_posts disabled=readOnly}} {{input type="checkbox" checked=buffered.show_posts disabled=readOnly}}
{{i18n admin.badges.show_posts}} {{i18n 'admin.badges.show_posts'}}
</label> </label>
</div> </div>
<div> <div>
<label> <label>
{{input type="checkbox" checked=buffered.enabled}} {{input type="checkbox" checked=buffered.enabled}}
{{i18n admin.badges.enabled}} {{i18n 'admin.badges.enabled'}}
</label> </label>
</div> </div>
<div class='buttons'> <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> <span class='saving'>{{savingStatus}}</span>
{{#unless readOnly}} {{#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}} {{/unless}}
</div> </div>
</form> </form>
@ -140,7 +140,7 @@
{{#if grant_count}} {{#if grant_count}}
<div class="span13 current-badge-actions"> <div class="span13 current-badge-actions">
<div> <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>
</div> </div>
{{/if}} {{/if}}

6
app/assets/javascripts/admin/templates/badges.hbs
View file

@ -1,21 +1,21 @@
<div class="badges"> <div class="badges">
<div class='content-list span6'> <div class='content-list span6'>
<h3>{{i18n admin.badges.title}}</h3> <h3>{{i18n 'admin.badges.title'}}</h3>
<ul> <ul>
{{#each}} {{#each}}
<li> <li>
{{#link-to 'adminBadges.show' id}} {{#link-to 'adminBadges.show' id}}
{{badge-button badge=this}} {{badge-button badge=this}}
{{#if newBadge}} {{#if newBadge}}
<span class="list-badge">{{i18n filters.new.lower_title}}</span> <span class="list-badge">{{i18n 'filters.new.lower_title'}}</span>
{{/if}} {{/if}}
{{/link-to}} {{/link-to}}
</li> </li>
{{/each}} {{/each}}
</ul> </ul>
{{#link-to 'adminBadges.show' 'new' class="btn"}} {{#link-to 'adminBadges.show' 'new' class="btn"}}
{{fa-icon "plus"}} {{i18n admin.badges.new}} {{fa-icon "plus"}} {{i18n 'admin.badges.new'}}
{{/link-to}} {{/link-to}}
<br> <br>
<br> <br>

8
app/assets/javascripts/admin/templates/customize.hbs
View file

@ -1,10 +1,10 @@
<div class='admin-controls'> <div class='admin-controls'>
<div class='span15'> <div class='span15'>
<ul class="nav nav-pills"> <ul class="nav nav-pills">
<li>{{#link-to 'adminCustomize.colors'}}{{i18n admin.customize.colors.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 '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 'adminSiteText'}}{{i18n 'admin.site_text.title'}}{{/link-to}}</li>
<li>{{#link-to 'adminUserFields'}}{{i18n admin.user_fields.title}}{{/link-to}}</li> <li>{{#link-to 'adminUserFields'}}{{i18n 'admin.user_fields.title'}}{{/link-to}}</li>
</ul> </ul>
</div> </div>
</div> </div>

26
app/assets/javascripts/admin/templates/customize_colors.hbs
View file

@ -1,5 +1,5 @@
<div class='content-list span6'> <div class='content-list span6'>
<h3>{{i18n admin.customize.colors.long_title}}</h3> <h3>{{i18n 'admin.customize.colors.long_title'}}</h3>
<ul> <ul>
{{#each model}} {{#each model}}
{{#unless is_base}} {{#unless is_base}}
@ -7,7 +7,7 @@
{{/unless}} {{/unless}}
{{/each}} {{/each}}
</ul> </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> </div>
{{#if selectedItem}} {{#if selectedItem}}
@ -17,16 +17,16 @@
<h1>{{text-field class="style-name" value=name}}</h1> <h1>{{text-field class="style-name" value=name}}</h1>
<div class="controls"> <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"> <button {{action "toggleEnabled"}} {{bind-attr disabled="disableEnable"}} class="btn">
{{#if enabled}} {{#if enabled}}
{{i18n disable}} {{i18n 'disable'}}
{{else}} {{else}}
{{i18n enable}} {{i18n 'enable'}}
{{/if}} {{/if}}
</button> </button>
<button {{action "copy" this}} class='btn'><i class="fa fa-copy"></i> {{i18n admin.customize.copy}}</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 "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> <span {{bind-attr class=":saving savingStatus::hidden" }}>{{savingStatus}}</span>
</div> </div>
{{/with}} {{/with}}
@ -37,7 +37,7 @@
<div class='search controls'> <div class='search controls'>
<label> <label>
{{input type="checkbox" checked=onlyOverridden}} {{input type="checkbox" checked=onlyOverridden}}
{{i18n admin.site_settings.show_overriden}} {{i18n 'admin.site_settings.show_overriden'}}
</label> </label>
</div> </div>
</div> </div>
@ -47,7 +47,7 @@
<thead> <thead>
<tr> <tr>
<th></th> <th></th>
<th class="hex">{{i18n admin.customize.color}}</th> <th class="hex">{{i18n 'admin.customize.color'}}</th>
<th></th> <th></th>
</tr> </tr>
</thead> </thead>
@ -61,20 +61,20 @@
</td> </td>
<td class="hex">{{color-input hexValue=hex brightnessValue=brightness valid=valid}}</td> <td class="hex">{{color-input hexValue=hex brightnessValue=brightness valid=valid}}</td>
<td class="actions"> <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 :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 :undo changed::invisible"}} {{action "undo" this}} title="{{i18n 'admin.customize.colors.undo_title'}}">{{i18n 'undo'}}</button>
</td> </td>
</tr> </tr>
{{/each}} {{/each}}
</tbody> </tbody>
</table> </table>
{{else}} {{else}}
<p>{{i18n search.no_results}}</p> <p>{{i18n 'search.no_results'}}</p>
{{/if}} {{/if}}
</div> </div>
</div> </div>
{{else}} {{else}}
<p class="about">{{i18n admin.customize.colors.about}}</p> <p class="about">{{i18n 'admin.customize.colors.about'}}</p>
{{/if}} {{/if}}
<div class="clearfix"></div> <div class="clearfix"></div>

32
app/assets/javascripts/admin/templates/customize_css_html.hbs
View file

@ -1,12 +1,12 @@
<div class='content-list span6'> <div class='content-list span6'>
<h3>{{i18n admin.customize.css_html.long_title}}</h3> <h3>{{i18n 'admin.customize.css_html.long_title'}}</h3>
<ul> <ul>
{{#each model}} {{#each model}}
<li><a {{action "selectStyle" this}} {{bind-attr class="this.selected:active"}}>{{this.description}}</a></li> <li><a {{action "selectStyle" this}} {{bind-attr class="this.selected:active"}}>{{this.description}}</a></li>
{{/each}} {{/each}}
</ul> </ul>
<button {{action "newCustomization"}} class='btn'> <button {{action "newCustomization"}} class='btn'>
{{fa-icon "plus"}}{{i18n admin.customize.new}} {{fa-icon "plus"}}{{i18n 'admin.customize.new'}}
</button> </button>
</div> </div>
@ -17,12 +17,12 @@
<div class='admin-controls'> <div class='admin-controls'>
<ul class="nav nav-pills"> <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.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.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.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.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.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.mobileFooterActive:active"}} {{action "selectMobileFooter" target="view"}}>{{fa-icon "mobile"}}&nbsp;{{i18n 'admin.customize.footer'}}</a></li>
</ul> </ul>
</div> </div>
@ -37,23 +37,23 @@
{{/with}} {{/with}}
<br> <br>
<div class='status-actions'> <div class='status-actions'>
<span>{{i18n admin.customize.override_default}} {{view Ember.Checkbox checkedBinding="selectedItem.override_default_style"}}</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> <span>{{i18n 'admin.customize.enabled'}} {{view Ember.Checkbox checkedBinding="selectedItem.enabled"}}</span>
{{#unless selectedItem.changed}} {{#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}} {{/unless}}
</div> </div>
<div class='buttons'> <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> <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>
</div> </div>
{{else}} {{else}}
<p class="about">{{i18n admin.customize.about}}</p> <p class="about">{{i18n 'admin.customize.about'}}</p>
{{/if}} {{/if}}

56
app/assets/javascripts/admin/templates/dashboard.hbs
View file

@ -24,15 +24,15 @@
<div class="dashboard-stats totals"> <div class="dashboard-stats totals">
<table> <table>
<tr> <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="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> <td class="value">{{#link-to 'adminUsersList.show' 'suspended'}}{{suspended}}{{/link-to}}</td>
</tr> </tr>
<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="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> <td class="value">{{#link-to 'adminUsersList.show' 'blocked'}}{{blocked}}{{/link-to}}</td>
</tr> </tr>
</table> </table>
@ -43,11 +43,11 @@
<thead> <thead>
<tr> <tr>
<th>&nbsp;</th> <th>&nbsp;</th>
<th>{{i18n admin.dashboard.reports.today}}</th> <th>{{i18n 'admin.dashboard.reports.today'}}</th>
<th>{{i18n admin.dashboard.reports.yesterday}}</th> <th>{{i18n 'admin.dashboard.reports.yesterday'}}</th>
<th>{{i18n admin.dashboard.reports.last_7_days}}</th> <th>{{i18n 'admin.dashboard.reports.last_7_days'}}</th>
<th>{{i18n admin.dashboard.reports.last_30_days}}</th> <th>{{i18n 'admin.dashboard.reports.last_30_days'}}</th>
<th>{{i18n admin.dashboard.reports.all}}</th> <th>{{i18n 'admin.dashboard.reports.all'}}</th>
</tr> </tr>
</thead> </thead>
{{#unless loading}} {{#unless loading}}
@ -67,12 +67,12 @@
<table class="table table-condensed table-hover"> <table class="table table-condensed table-hover">
<thead> <thead>
<tr> <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 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.today'}}</th>
<th>{{i18n admin.dashboard.reports.yesterday}}</th> <th>{{i18n 'admin.dashboard.reports.yesterday'}}</th>
<th>{{i18n admin.dashboard.reports.last_7_days}}</th> <th>{{i18n 'admin.dashboard.reports.last_7_days'}}</th>
<th>{{i18n admin.dashboard.reports.last_30_days}}</th> <th>{{i18n 'admin.dashboard.reports.last_30_days'}}</th>
<th>{{i18n admin.dashboard.reports.all}}</th> <th>{{i18n 'admin.dashboard.reports.all'}}</th>
</tr> </tr>
</thead> </thead>
{{#unless loading}} {{#unless loading}}
@ -90,10 +90,10 @@
<thead> <thead>
<tr> <tr>
<th>&nbsp;</th> <th>&nbsp;</th>
<th>{{i18n admin.dashboard.reports.today}}</th> <th>{{i18n 'admin.dashboard.reports.today'}}</th>
<th>{{i18n admin.dashboard.reports.yesterday}}</th> <th>{{i18n 'admin.dashboard.reports.yesterday'}}</th>
<th>{{i18n admin.dashboard.reports.7_days_ago}}</th> <th>{{i18n 'admin.dashboard.reports.7_days_ago'}}</th>
<th>{{i18n admin.dashboard.reports.30_days_ago}}</th> <th>{{i18n 'admin.dashboard.reports.30_days_ago'}}</th>
</tr> </tr>
</thead> </thead>
{{#unless loading}} {{#unless loading}}
@ -110,7 +110,7 @@
<div class="look-here"><i class="fa fa-exclamation-triangle"></i></div> <div class="look-here"><i class="fa fa-exclamation-triangle"></i></div>
<div class="problem-messages"> <div class="problem-messages">
<p {{bind-attr class="loadingProblems:invisible"}}> <p {{bind-attr class="loadingProblems:invisible"}}>
{{i18n admin.dashboard.problems_found}} {{i18n 'admin.dashboard.problems_found'}}
<ul {{bind-attr class="loadingProblems:invisible"}}> <ul {{bind-attr class="loadingProblems:invisible"}}>
{{#each problem in problems}} {{#each problem in problems}}
<li>{{{problem}}}</li> <li>{{{problem}}}</li>
@ -118,8 +118,8 @@
</ul> </ul>
</p> </p>
<p class="actions"> <p class="actions">
<small>{{i18n admin.dashboard.last_checked}}: {{problemsTimestamp}}</small> <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> <button {{action "refreshProblems"}} class="btn btn-small"><i class="fa fa-refresh"></i>{{i18n 'admin.dashboard.refresh_problems'}}</button>
</p> </p>
</div> </div>
<div class="clearfix"></div> <div class="clearfix"></div>
@ -130,8 +130,8 @@
<div class="look-here">&nbsp;</div> <div class="look-here">&nbsp;</div>
<div class="problem-messages"> <div class="problem-messages">
<p> <p>
{{i18n admin.dashboard.no_problems}} {{i18n 'admin.dashboard.no_problems'}}
<button {{action "refreshProblems"}} class="btn btn-small"><i class="fa fa-refresh"></i>{{i18n admin.dashboard.refresh_problems}}</button> <button {{action "refreshProblems"}} class="btn btn-small"><i class="fa fa-refresh"></i>{{i18n 'admin.dashboard.refresh_problems'}}</button>
</p> </p>
</div> </div>
<div class="clearfix"></div> <div class="clearfix"></div>
@ -143,7 +143,7 @@
<table class="table table-condensed table-hover"> <table class="table table-condensed table-hover">
<thead> <thead>
<tr> <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> <th>{{top_referred_topics.ytitles.num_clicks}}</th>
</tr> </tr>
</thead> </thead>
@ -170,7 +170,7 @@
<table class="table table-condensed table-hover"> <table class="table table-condensed table-hover">
<thead> <thead>
<tr> <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_clicks}}</th>
<th>{{top_traffic_sources.ytitles.num_topics}}</th> <th>{{top_traffic_sources.ytitles.num_topics}}</th>
</tr> </tr>
@ -193,7 +193,7 @@
<table class="table table-condensed table-hover"> <table class="table table-condensed table-hover">
<thead> <thead>
<tr> <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_clicks}}</th>
<th>{{top_referrers.ytitles.num_topics}}</th> <th>{{top_referrers.ytitles.num_topics}}</th>
</tr> </tr>
@ -215,7 +215,7 @@
<div class='clearfix'></div> <div class='clearfix'></div>
<div class="dashboard-stats pull-right"> <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 class='clearfix'></div>
</div> </div>
<div class='clearfix'></div> <div class='clearfix'></div>

10
app/assets/javascripts/admin/templates/email.hbs
View file

@ -1,11 +1,11 @@
<div class='admin-controls'> <div class='admin-controls'>
<div class='span15'> <div class='span15'>
<ul class="nav nav-pills"> <ul class="nav nav-pills">
<li>{{#link-to 'adminEmail.index'}}{{i18n admin.email.settings}}{{/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.all'}}{{i18n 'admin.email.all'}}{{/link-to}}</li>
<li>{{#link-to 'adminEmail.sent'}}{{i18n admin.email.sent}}{{/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.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.previewDigest'}}{{i18n 'admin.email.preview_digest'}}{{/link-to}}</li>
</ul> </ul>
</div> </div>
</div> </div>

14
app/assets/javascripts/admin/templates/email_all.hbs
View file

@ -1,16 +1,16 @@
<table class='table'> <table class='table'>
<thead> <thead>
<tr> <tr>
<th>{{i18n admin.email.time}}</th> <th>{{i18n 'admin.email.time'}}</th>
<th>{{i18n admin.email.user}}</th> <th>{{i18n 'admin.email.user'}}</th>
<th>{{i18n admin.email.to_address}}</th> <th>{{i18n 'admin.email.to_address'}}</th>
<th>{{i18n admin.email.email_type}}</th> <th>{{i18n 'admin.email.email_type'}}</th>
<th>{{i18n admin.email.skipped_reason}}</th> <th>{{i18n 'admin.email.skipped_reason'}}</th>
</tr> </tr>
</thead> </thead>
<tr class="filters"> <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.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.address placeholderKey="admin.email.logs.filters.address_placeholder"}}</td>
<td>{{text-field value=filter.type placeholderKey="admin.email.logs.filters.type_placeholder"}}</td> <td>{{text-field value=filter.type placeholderKey="admin.email.logs.filters.type_placeholder"}}</td>
@ -33,7 +33,7 @@
<td>{{skipped_reason}}</td> <td>{{skipped_reason}}</td>
</tr> </tr>
{{else}} {{else}}
<tr><td colspan="5">{{i18n admin.email.logs.none}}</td></tr> <tr><td colspan="5">{{i18n 'admin.email.logs.none'}}</td></tr>
{{/each}} {{/each}}
</table> </table>

8
app/assets/javascripts/admin/templates/email_index.hbs
View file

@ -1,6 +1,6 @@
<table class="table"> <table class="table">
<tr> <tr>
<th>{{i18n admin.email.delivery_method}}</th> <th>{{i18n 'admin.email.delivery_method'}}</th>
<td>{{model.delivery_method}}</td> <td>{{model.delivery_method}}</td>
</tr> </tr>
@ -14,14 +14,14 @@
<div class='admin-controls'> <div class='admin-controls'>
{{#if sendingEmail}} {{#if sendingEmail}}
<div class='span15 controls'>{{i18n admin.email.sending_test}}</div> <div class='span15 controls'>{{i18n 'admin.email.sending_test'}}</div>
{{else}} {{else}}
<div class='controls'> <div class='controls'>
{{text-field value=testEmailAddress placeholderKey="admin.email.test_email_address"}} {{text-field value=testEmailAddress placeholderKey="admin.email.test_email_address"}}
</div> </div>
<div class='span10 controls'> <div class='span10 controls'>
<button class='btn btn-primary' {{action "sendTestEmail"}} {{bind-attr disabled="sendTestEmailDisabled"}}>{{i18n admin.email.send_test}}</button> <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}} {{#if sentTestEmail}}<span class='result-message'>{{i18n 'admin.email.sent_test'}}</span>{{/if}}
</div> </div>
{{/if}} {{/if}}
</div> </div>

12
app/assets/javascripts/admin/templates/email_preview_digest.hbs
View file

@ -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='admin-controls'>
<div class='span7 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"}} {{input type="date" value=lastSeen id="last-seen"}}
</div> </div>
<div> <div>
<button class='btn' {{action "refresh"}}>{{i18n admin.email.refresh}}</button> <button class='btn' {{action "refresh"}}>{{i18n 'admin.email.refresh'}}</button>
</div> </div>
<div class="span7 toggle"> <div class="span7 toggle">
<label>{{i18n admin.email.format}}</label> <label>{{i18n 'admin.email.format'}}</label>
{{#if showHtml}} {{#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}} {{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}} {{/if}}
</div> </div>
</div> </div>

14
app/assets/javascripts/admin/templates/email_sent.hbs
View file

@ -1,16 +1,16 @@
<table class='table'> <table class='table'>
<thead> <thead>
<tr> <tr>
<th>{{i18n admin.email.sent_at}}</th> <th>{{i18n 'admin.email.sent_at'}}</th>
<th>{{i18n admin.email.user}}</th> <th>{{i18n 'admin.email.user'}}</th>
<th>{{i18n admin.email.to_address}}</th> <th>{{i18n 'admin.email.to_address'}}</th>
<th>{{i18n admin.email.email_type}}</th> <th>{{i18n 'admin.email.email_type'}}</th>
<th>{{i18n admin.email.reply_key}}</th> <th>{{i18n 'admin.email.reply_key'}}</th>
</tr> </tr>
</thead> </thead>
<tr class="filters"> <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.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.address placeholderKey="admin.email.logs.filters.address_placeholder"}}</td>
<td>{{text-field value=filter.type placeholderKey="admin.email.logs.filters.type_placeholder"}}</td> <td>{{text-field value=filter.type placeholderKey="admin.email.logs.filters.type_placeholder"}}</td>
@ -33,7 +33,7 @@
<td>{{reply_key}}</td> <td>{{reply_key}}</td>
</tr> </tr>
{{else}} {{else}}
<tr><td colspan="5">{{i18n admin.email.logs.none}}</td></tr> <tr><td colspan="5">{{i18n 'admin.email.logs.none'}}</td></tr>
{{/each}} {{/each}}
</table> </table>

14
app/assets/javascripts/admin/templates/email_skipped.hbs
View file

@ -1,16 +1,16 @@
<table class='table'> <table class='table'>
<thead> <thead>
<tr> <tr>
<th>{{i18n admin.email.time}}</th> <th>{{i18n 'admin.email.time'}}</th>
<th>{{i18n admin.email.user}}</th> <th>{{i18n 'admin.email.user'}}</th>
<th>{{i18n admin.email.to_address}}</th> <th>{{i18n 'admin.email.to_address'}}</th>
<th>{{i18n admin.email.email_type}}</th> <th>{{i18n 'admin.email.email_type'}}</th>
<th>{{i18n admin.email.skipped_reason}}</th> <th>{{i18n 'admin.email.skipped_reason'}}</th>
</tr> </tr>
</thead> </thead>
<tr class="filters"> <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.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.address placeholderKey="admin.email.logs.filters.address_placeholder"}}</td>
<td>{{text-field value=filter.type placeholderKey="admin.email.logs.filters.type_placeholder"}}</td> <td>{{text-field value=filter.type placeholderKey="admin.email.logs.filters.type_placeholder"}}</td>
@ -33,7 +33,7 @@
<td>{{skipped_reason}}</td> <td>{{skipped_reason}}</td>
</tr> </tr>
{{else}} {{else}}
<tr><td colspan="5">{{i18n admin.email.logs.none}}</td></tr> <tr><td colspan="5">{{i18n 'admin.email.logs.none'}}</td></tr>
{{/each}} {{/each}}
</table> </table>

28
app/assets/javascripts/admin/templates/flags-list.hbs
View file

@ -4,8 +4,8 @@
<tr> <tr>
<th class='user'></th> <th class='user'></th>
<th class='excerpt'></th> <th class='excerpt'></th>
<th class='flaggers'>{{i18n admin.flags.flagged_by}}</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'>{{#if adminOldFlagsView}}{{i18n 'admin.flags.resolved_by'}}{{/if}}</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@ -16,12 +16,12 @@
{{#if flaggedPost.postAuthorFlagged}} {{#if flaggedPost.postAuthorFlagged}}
{{#if flaggedPost.user}} {{#if flaggedPost.user}}
{{#link-to 'adminUser' flaggedPost.user}}{{avatar flaggedPost.user imageSize="small"}}{{/link-to}} {{#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}} {{/if}}
{{#if adminActiveFlagsView}} {{#if adminActiveFlagsView}}
{{#if flaggedPost.previous_flags_count}} {{#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}}
{{/if}} {{/if}}
</td> </td>
@ -78,7 +78,7 @@
{{format-age disposedAt}} {{format-age disposedAt}}
{{{dispositionIcon}}} {{{dispositionIcon}}}
{{#if tookAction}} {{#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}} {{/if}}
</td> </td>
</tr> </tr>
@ -95,7 +95,7 @@
<td></td> <td></td>
<td colspan="3"> <td colspan="3">
<div> <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> </div>
</td> </td>
</tr> </tr>
@ -114,12 +114,12 @@
<p> <p>
{{#link-to 'adminUser' reply.user}}{{avatar reply.user imageSize="small"}}{{/link-to}}&nbsp;{{{reply.excerpt}}} {{#link-to 'adminUser' reply.user}}{{avatar reply.user imageSize="small"}}{{/link-to}}&nbsp;{{{reply.excerpt}}}
{{#if hasMore}} {{#if hasMore}}
<a href="{{unbound permalink}}">{{i18n admin.flags.more}}</a> <a href="{{unbound permalink}}">{{i18n 'admin.flags.more'}}</a>
{{/if}} {{/if}}
</p> </p>
{{/if}} {{/if}}
<a href="{{unbound permalink}}"> <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> </a>
{{/if}} {{/if}}
</div> </div>
@ -130,14 +130,14 @@
<tr> <tr>
<td colspan="4" class="action"> <td colspan="4" class="action">
{{#if adminActiveFlagsView}} {{#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}} {{#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}} {{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}} {{/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.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.delete_title'}}' class='btn btn-danger' {{action "showDeleteFlagModal" flaggedPost}}><i class="fa fa-trash-o"></i>{{i18n 'admin.flags.delete'}}&hellip;</button>
{{/if}} {{/if}}
</td> </td>
</tr> </tr>
@ -149,5 +149,5 @@
{{loading-spinner condition=view.loading}} {{loading-spinner condition=view.loading}}
{{else}} {{else}}
<p>{{i18n admin.flags.no_results}}</p> <p>{{i18n 'admin.flags.no_results'}}</p>
{{/if}} {{/if}}

4
app/assets/javascripts/admin/templates/flags.hbs
View file

@ -1,8 +1,8 @@
<div class='admin-controls'> <div class='admin-controls'>
<div class='span15'> <div class='span15'>
<ul class="nav nav-pills"> <ul class="nav nav-pills">
<li>{{#link-to 'adminFlags.list' 'active'}}{{i18n admin.flags.active}}{{/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> <li>{{#link-to 'adminFlags.list' 'old'}}{{i18n 'admin.flags.old'}}{{/link-to}}</li>
</ul> </ul>
</div> </div>
</div> </div>

10
app/assets/javascripts/admin/templates/group.hbs
View file

@ -5,25 +5,25 @@
{{/if}} {{/if}}
<div class="control-group"> <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"> <div class="controls">
{{user-selector usernames=usernames id="group-users" placeholderKey="admin.groups.selector_placeholder" tabindex="1" disabled=automatic}} {{user-selector usernames=usernames id="group-users" placeholderKey="admin.groups.selector_placeholder" tabindex="1" disabled=automatic}}
</div> </div>
</div> </div>
<div class="control-group"> <div class="control-group">
<div class="controls"> <div class="controls">
{{input type="checkbox" checked=visible}} {{i18n groups.visible}} {{input type="checkbox" checked=visible}} {{i18n 'groups.visible'}}
</div> </div>
</div> </div>
<div class="control-group"> <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"> <div class="controls">
{{combo-box valueAttribute="value" value=alias_level content=aliasLevelOptions}} {{combo-box valueAttribute="value" value=alias_level content=aliasLevelOptions}}
</div> </div>
</div> </div>
<div class='controls'> <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}} {{#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}} {{/unless}}
</div> </div>

6
app/assets/javascripts/admin/templates/groups.hbs
View file

@ -1,6 +1,6 @@
<div class='row groups'> <div class='row groups'>
<div class='content-list span6'> <div class='content-list span6'>
<h3>{{i18n admin.groups.edit}}</h3> <h3>{{i18n 'admin.groups.edit'}}</h3>
<ul> <ul>
{{#each group in arrangedContent}} {{#each group in arrangedContent}}
<li> <li>
@ -9,8 +9,8 @@
{{/each}} {{/each}}
</ul> </ul>
<div class='controls'> <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' {{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' {{action "newGroup"}}><i class="fa fa-plus"></i>{{i18n 'admin.groups.new'}}</button>
</div> </div>
</div> </div>

2
app/assets/javascripts/admin/templates/groups_index.hbs
View file

@ -1 +1 @@
{{i18n admin.groups.about}} {{i18n 'admin.groups.about'}}

12
app/assets/javascripts/admin/templates/logs.hbs
View file

@ -1,15 +1,15 @@
<div class='admin-controls'> <div class='admin-controls'>
<div class='span15'> <div class='span15'>
<ul class="nav nav-pills"> <ul class="nav nav-pills">
<li>{{#link-to 'adminLogs.staffActionLogs'}}{{i18n admin.logs.staff_actions.title}}{{/link-to}}</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.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.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>{{#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><a href="/logs" data-auto-route="true">{{i18n 'admin.logs.logster.title'}}</a></li>
</ul> </ul>
</div> </div>
<div class="pull-right"> <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>
</div> </div>

12
app/assets/javascripts/admin/templates/logs/_site_customization_change_details.hbs
View file

@ -1,22 +1,22 @@
<section class="field"> <section class="field">
<b>{{i18n admin.customize.css}}</b>: <b>{{i18n 'admin.customize.css'}}</b>:
{{#if stylesheet}} {{#if stylesheet}}
({{i18n character_count count=stylesheet.length}}) ({{i18n 'character_count' count=stylesheet.length}})
{{/if}} {{/if}}
<br/> <br/>
{{textarea value=stylesheet class="plain"}} {{textarea value=stylesheet class="plain"}}
</section> </section>
<section class="field"> <section class="field">
<b>{{i18n admin.customize.header}}</b>: <b>{{i18n 'admin.customize.header'}}</b>:
{{#if header}} {{#if header}}
({{i18n character_count count=header.length}}) ({{i18n 'character_count' count=header.length}})
{{/if}} {{/if}}
<br/> <br/>
{{textarea value=header class="plain"}} {{textarea value=header class="plain"}}
</section> </section>
<section class="field"> <section class="field">
<b>{{i18n admin.customize.enabled}}</b>: {{enabled}} <b>{{i18n 'admin.customize.enabled'}}</b>: {{enabled}}
</section> </section>
<section class="field"> <section class="field">
<b>{{i18n admin.customize.override_default}}</b>: {{override_default_style}} <b>{{i18n 'admin.customize.override_default'}}</b>: {{override_default_style}}
</section> </section>

2
app/assets/javascripts/admin/templates/logs/details_modal.hbs
View file

@ -2,5 +2,5 @@
<pre>{{details}}</pre> <pre>{{details}}</pre>
</div> </div>
<div class="modal-footer"> <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>

16
app/assets/javascripts/admin/templates/logs/screened_emails.hbs
View file

@ -1,16 +1,16 @@
<p>{{i18n admin.logs.screened_emails.description}}</p> <p>{{i18n 'admin.logs.screened_emails.description'}}</p>
{{#loading-spinner condition=loading}} {{#loading-spinner condition=loading}}
{{#if model.length}} {{#if model.length}}
<div class='table screened-emails'> <div class='table screened-emails'>
<div class="heading-container"> <div class="heading-container">
<div class="col heading first email">{{i18n admin.logs.screened_emails.email}}</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 action">{{i18n 'admin.logs.action'}}</div>
<div class="col heading match_count">{{i18n admin.logs.match_count}}</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 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 created_at">{{i18n 'admin.logs.created_at'}}</div>
<div class="col heading ip_address">{{i18n admin.logs.ip_address}}</div> <div class="col heading ip_address">{{i18n 'admin.logs.ip_address'}}</div>
<div class="col heading action"></div> <div class="col heading action"></div>
<div class="clearfix"></div> <div class="clearfix"></div>
</div> </div>
@ -19,6 +19,6 @@
</div> </div>
{{else}} {{else}}
{{i18n search.no_results}} {{i18n 'search.no_results'}}
{{/if}} {{/if}}
{{/loading-spinner}} {{/loading-spinner}}

2
app/assets/javascripts/admin/templates/logs/screened_emails_list_item.hbs
View file

@ -6,5 +6,5 @@
<div class="col last_match_at">{{age-with-tooltip last_match_at}}</div> <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 created_at">{{age-with-tooltip created_at}}</div>
<div class="col ip_address">{{ip_address}}</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> <div class="clearfix"></div>

16
app/assets/javascripts/admin/templates/logs/screened_ip_addresses.hbs
View file

@ -1,5 +1,5 @@
<p>{{i18n admin.logs.screened_ips.description}}</p> <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> <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"}} {{screened-ip-address-form action="recordAdded"}}
<br/> <br/>
@ -8,11 +8,11 @@
<div class='table admin-logs-table screened-ip-addresses'> <div class='table admin-logs-table screened-ip-addresses'>
<div class="heading-container"> <div class="heading-container">
<div class="col heading first ip_address">{{i18n admin.logs.ip_address}}</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 action">{{i18n 'admin.logs.action'}}</div>
<div class="col heading match_count">{{i18n admin.logs.match_count}}</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 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 created_at">{{i18n 'admin.logs.created_at'}}</div>
<div class="col heading actions"></div> <div class="col heading actions"></div>
<div class="clearfix"></div> <div class="clearfix"></div>
</div> </div>
@ -21,6 +21,6 @@
</div> </div>
{{else}} {{else}}
{{i18n search.no_results}} {{i18n 'search.no_results'}}
{{/if}} {{/if}}
{{/loading-spinner}} {{/loading-spinner}}

8
app/assets/javascripts/admin/templates/logs/screened_ip_addresses_list_item.hbs
View file

@ -27,13 +27,13 @@
<button class="btn btn-danger" {{action "destroy" this}}><i class="fa fa-trash-o"></i></button> <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> <button class="btn" {{action "edit" this}}><i class="fa fa-pencil"></i></button>
{{#if isBlocked}} {{#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}} {{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}} {{/if}}
{{else}} {{else}}
<button class="btn" {{action "save" this}}>{{i18n admin.logs.save}}</button> <button class="btn" {{action "save" this}}>{{i18n 'admin.logs.save'}}</button>
<a {{action "cancel" this}}>{{i18n cancel}}</a> <a {{action "cancel" this}}>{{i18n 'cancel'}}</a>
{{/unless}} {{/unless}}
</div> </div>
<div class="clearfix"></div> <div class="clearfix"></div>

14
app/assets/javascripts/admin/templates/logs/screened_urls.hbs
View file

@ -1,20 +1,20 @@
<p>{{i18n admin.logs.screened_urls.description}}</p> <p>{{i18n 'admin.logs.screened_urls.description'}}</p>
{{#loading-spinner condition=loading}} {{#loading-spinner condition=loading}}
{{#if model.length}} {{#if model.length}}
<div class='table screened-urls'> <div class='table screened-urls'>
<div class="heading-container"> <div class="heading-container">
<div class="col heading first domain">{{i18n admin.logs.screened_urls.domain}}</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 action">{{i18n 'admin.logs.action'}}</div>
<div class="col heading match_count">{{i18n admin.logs.match_count}}</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 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 created_at">{{i18n 'admin.logs.created_at'}}</div>
<div class="clearfix"></div> <div class="clearfix"></div>
</div> </div>
{{view 'screened-urls-list' content=controller}} {{view 'screened-urls-list' content=controller}}
</div> </div>
{{else}} {{else}}
{{i18n search.no_results}} {{i18n 'search.no_results'}}
{{/if}} {{/if}}
{{/loading-spinner}} {{/loading-spinner}}

10
app/assets/javascripts/admin/templates/logs/site_customization_change_modal.hbs
View file

@ -1,10 +1,10 @@
<div> <div>
<ul class="nav nav-pills"> <ul class="nav nav-pills">
<li {{bind-attr class="newSelected:active"}}> <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>
<li {{bind-attr class="previousSelected:active"}}> <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> </li>
</ul> </ul>
<div class="modal-body"> <div class="modal-body">
@ -14,7 +14,7 @@
{{partial "admin/templates/logs/site_customization_change_details"}} {{partial "admin/templates/logs/site_customization_change_details"}}
{{/with}} {{/with}}
{{else}} {{else}}
{{i18n admin.logs.staff_actions.deleted}} {{i18n 'admin.logs.staff_actions.deleted'}}
{{/if}} {{/if}}
</div> </div>
<div {{bind-attr class=":modal-tab :previous-tab previousSelected::invisible"}}> <div {{bind-attr class=":modal-tab :previous-tab previousSelected::invisible"}}>
@ -23,11 +23,11 @@
{{partial "admin/templates/logs/site_customization_change_details"}} {{partial "admin/templates/logs/site_customization_change_details"}}
{{/with}} {{/with}}
{{else}} {{else}}
{{i18n admin.logs.staff_actions.no_previous}} {{i18n 'admin.logs.staff_actions.no_previous'}}
{{/if}} {{/if}}
</div> </div>
</div> </div>
<div class="modal-footer"> <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>
</div> </div>

26
app/assets/javascripts/admin/templates/logs/staff_action_logs.hbs
View file

@ -1,45 +1,45 @@
<div class="staff-action-logs-controls"> <div class="staff-action-logs-controls">
<a {{action "clearAllFilters"}} {{bind-attr class=":clear-filters :filter filtersExists::invisible"}}> <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> </a>
{{#if actionFilter}} {{#if actionFilter}}
<a {{action "clearFilter" "action_name"}} class="filter"> <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> <i class="fa fa-times-circle"></i>
</a> </a>
{{/if}} {{/if}}
{{#if filters.acting_user}} {{#if filters.acting_user}}
<a {{action "clearFilter" "acting_user"}} class="filter"> <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> <i class="fa fa-times-circle"></i>
</a> </a>
{{/if}} {{/if}}
{{#if filters.target_user}} {{#if filters.target_user}}
<a {{action "clearFilter" "target_user"}} class="filter"> <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> <i class="fa fa-times-circle"></i>
</a> </a>
{{/if}} {{/if}}
{{#if filters.subject}} {{#if filters.subject}}
<a {{action "clearFilter" "subject"}} class="filter"> <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> <i class="fa fa-times-circle"></i>
</a> </a>
{{/if}} {{/if}}
</div> </div>
<div class="staff-action-logs-instructions" {{bind-attr class=":staff-action-logs-instructions showInstructions::invisible"}}> <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>
<div class='table staff-actions'> <div class='table staff-actions'>
<div class="heading-container"> <div class="heading-container">
<div class="col heading first staff_user">{{i18n admin.logs.staff_actions.staff_user}}</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 action">{{i18n 'admin.logs.action'}}</div>
<div class="col heading subject">{{i18n admin.logs.staff_actions.subject}}</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 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 details">{{i18n 'admin.logs.staff_actions.details'}}</div>
<div class="col heading context">{{i18n admin.logs.staff_actions.context}}</div> <div class="col heading context">{{i18n 'admin.logs.staff_actions.context'}}</div>
<div class="clearfix"></div> <div class="clearfix"></div>
</div> </div>
@ -47,7 +47,7 @@
{{#if model.length}} {{#if model.length}}
{{view "staff-action-logs-list" content=controller}} {{view "staff-action-logs-list" content=controller}}
{{else}} {{else}}
{{i18n search.no_results}} {{i18n 'search.no_results'}}
{{/if}} {{/if}}
{{/loading-spinner}} {{/loading-spinner}}
</div> </div>

4
app/assets/javascripts/admin/templates/logs/staff_action_logs_list_item.hbs
View file

@ -18,10 +18,10 @@
<div class="col value details"> <div class="col value details">
{{{formattedDetails}}} {{{formattedDetails}}}
{{#if useCustomModalForDetails}} {{#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}}
{{#if useModalForDetails}} {{#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}} {{/if}}
</div> </div>
<div class="col value context">{{context}}</div> <div class="col value context">{{context}}</div>

8
app/assets/javascripts/admin/templates/modal/admin_agree_flag.hbs
View file

@ -1,11 +1,11 @@
{{#if user_deleted}} {{#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}} {{else}}
{{#unless postHidden}} {{#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}} {{/unless}}
{{/if}} {{/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}} {{#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}} {{/if}}

12
app/assets/javascripts/admin/templates/modal/admin_badge_preview.hbs
View file

@ -1,31 +1,31 @@
<div class="badge-query-preview"> <div class="badge-query-preview">
{{#if errors}} {{#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> <pre class="badge-errors">{{errors}}</pre>
<!-- <!--
TODO we want some help pages for this, link to those instead TODO we want some help pages for this, link to those instead
<p> <p>
{{i18n admin.badges.preview.error_help}} {{i18n 'admin.badges.preview.error_help'}}
</p> </p>
<ul> <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> <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> </ul>
--> -->
{{else}} {{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}} {{#if count_warning}}
<div class="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="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="body">{{i18n 'admin.badges.preview.bad_count_warning.text'}}</p>
</div> </div>
{{/if}} {{/if}}
{{#if sample}} {{#if sample}}
<p class="sample"> <p class="sample">
{{i18n admin.badges.preview.sample}} {{i18n 'admin.badges.preview.sample'}}
</p> </p>
<ul> <ul>
{{#each html in processed_sample}} {{#each html in processed_sample}}

6
app/assets/javascripts/admin/templates/modal/admin_delete_flag.hbs
View file

@ -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_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_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}} {{#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}} {{/if}}

6
app/assets/javascripts/admin/templates/modal/admin_edit_badge_groupings.hbs
View file

@ -20,9 +20,9 @@
{{/each}} {{/each}}
</ul> </ul>
</div> </div>
<button class='btn' {{action "add"}}>{{i18n admin.badges.new}}</button> <button class='btn' {{action "add"}}>{{i18n 'admin.badges.new'}}</button>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button class='btn btn-primary' {{action "saveAll"}} {{bind-attr disabled="submitDisabled"}}>{{i18n admin.badges.save}}</button> <button class='btn btn-primary' {{action "saveAll"}} {{bind-attr disabled="submitDisabled"}}>{{i18n 'admin.badges.save'}}</button>
<a {{action "cancel"}}>{{i18n cancel}}</a> <a {{action "cancel"}}>{{i18n 'cancel'}}</a>
</div> </div>

6
app/assets/javascripts/admin/templates/modal/admin_start_backup.hbs
View file

@ -1,3 +1,3 @@
<button {{action "startBackup"}} class="btn btn-primary">{{i18n yes_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 "startBackupWithoutUpload"}} class="btn">{{i18n 'admin.backups.operations.backup.without_uploads'}}</button>
<button {{action "cancel"}} class="btn">{{i18n no_value}}</button> <button {{action "cancel"}} class="btn">{{i18n 'no_value'}}</button>

10
app/assets/javascripts/admin/templates/modal/admin_suspend_user.hbs
View file

@ -1,15 +1,15 @@
<div class="modal-body"> <div class="modal-body">
<form> <form>
{{i18n admin.user.suspend_duration}} {{i18n 'admin.user.suspend_duration'}}
{{text-field value=duration maxlength="5" autofocus="autofocus"}} {{text-field value=duration maxlength="5" autofocus="autofocus"}}
{{i18n admin.user.suspend_duration_units}}<br/> {{i18n 'admin.user.suspend_duration_units'}}<br/>
<br/> <br/>
{{{i18n admin.user.suspend_reason_label}}}<br/> {{{i18n 'admin.user.suspend_reason_label'}}}<br/>
<br/> <br/>
{{text-field value=reason class="span8"}} {{text-field value=reason class="span8"}}
</form> </form>
</div> </div>
<div class="modal-footer"> <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> <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> <a {{action "closeModal"}}>{{i18n 'cancel'}}</a>
</div> </div>

14
app/assets/javascripts/admin/templates/reports.hbs
View file

@ -1,22 +1,22 @@
<h3>{{title}}</h3> <h3>{{title}}</h3>
<div> <div>
{{i18n admin.dashboard.reports.start_date}} {{input type="date" value=startDate}} {{i18n 'admin.dashboard.reports.start_date'}} {{input type="date" value=startDate}}
{{i18n admin.dashboard.reports.end_date}} {{input type="date" value=endDate}} {{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> <button {{action "refreshReport"}} class='btn btn-primary'>{{i18n 'admin.dashboard.reports.refresh_report'}}</button>
</div> </div>
<div class='view-options'> <div class='view-options'>
{{#if viewingTable}} {{#if viewingTable}}
{{i18n admin.dashboard.reports.view_table}} {{i18n 'admin.dashboard.reports.view_table'}}
{{else}} {{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}}
| |
{{#if viewingBarChart}} {{#if viewingBarChart}}
{{i18n admin.dashboard.reports.view_chart}} {{i18n 'admin.dashboard.reports.view_chart'}}
{{else}} {{else}}
<a href {{action "viewAsBarChart"}}>{{i18n admin.dashboard.reports.view_chart}}</a> <a href {{action "viewAsBarChart"}}>{{i18n 'admin.dashboard.reports.view_chart'}}</a>
{{/if}} {{/if}}
</div> </div>

4
app/assets/javascripts/admin/templates/site_settings.hbs
View file

@ -2,12 +2,12 @@
<div class='search controls'> <div class='search controls'>
<label> <label>
{{input type="checkbox" checked=onlyOverridden}} {{input type="checkbox" checked=onlyOverridden}}
{{i18n admin.site_settings.show_overriden}} {{i18n 'admin.site_settings.show_overriden'}}
</label> </label>
</div> </div>
<div class='controls'> <div class='controls'>
{{text-field value=filter placeholderKey="type_to_filter"}} {{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>
</div> </div>

2
app/assets/javascripts/admin/templates/site_settings/setting_bool.hbs
View file

@ -14,6 +14,6 @@
</div> </div>
{{else}} {{else}}
{{#if overridden}} {{#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}}
{{/if}} {{/if}}

2
app/assets/javascripts/admin/templates/site_settings/setting_enum.hbs
View file

@ -12,6 +12,6 @@
</div> </div>
{{else}} {{else}}
{{#if overridden}} {{#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}}
{{/if}} {{/if}}

2
app/assets/javascripts/admin/templates/site_settings/setting_list.hbs
View file

@ -12,6 +12,6 @@
</div> </div>
{{else}} {{else}}
{{#if overridden}} {{#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}}
{{/if}} {{/if}}

2
app/assets/javascripts/admin/templates/site_settings/setting_string.hbs
View file

@ -13,6 +13,6 @@
</div> </div>
{{else}} {{else}}
{{#if overridden}} {{#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}}
{{/if}} {{/if}}

2
app/assets/javascripts/admin/templates/site_settings_category.hbs
View file

@ -2,5 +2,5 @@
{{collection contentBinding="filteredContent" classNames="form-horizontal settings" itemView="site-setting"}} {{collection contentBinding="filteredContent" classNames="form-horizontal settings" itemView="site-setting"}}
{{else}} {{else}}
<br/> <br/>
{{i18n admin.site_settings.no_results}} {{i18n 'admin.site_settings.no_results'}}
{{/if}} {{/if}}

6
app/assets/javascripts/admin/templates/site_text_edit.hbs
View file

@ -17,10 +17,10 @@
<div class='controls'> <div class='controls'>
<button class='btn' {{action "saveChanges"}} {{bind-attr disabled="saveDisabled"}}> <button class='btn' {{action "saveChanges"}} {{bind-attr disabled="saveDisabled"}}>
{{#if saving}} {{#if saving}}
{{i18n saving}} {{i18n 'saving'}}
{{else}} {{else}}
{{i18n save}} {{i18n 'save'}}
{{/if}} {{/if}}
</button> </button>
{{#if saved}}{{i18n saved}}{{/if}} {{#if saved}}{{i18n 'saved'}}{{/if}}
</div> </div>

2
app/assets/javascripts/admin/templates/site_text_index.hbs
View file

@ -1 +1 @@
<p>{{i18n admin.site_text.none}}</p> <p>{{i18n 'admin.site_text.none'}}</p>

18
app/assets/javascripts/admin/templates/user-fields.hbs
View file

@ -1,7 +1,7 @@
<div class='user-fields'> <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}} {{#if model}}
{{#each f in model itemController="admin-user-field-item" itemView="admin-user-field-item"}} {{#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}} {{combo-box content=fieldTypes valueAttribute="id" value=f.buffered.field_type}}
</div> </div>
<div class='form-element controls'> <div class='form-element controls'>
<button {{action "save"}}class='btn btn-primary'>{{fa-icon 'check'}} {{i18n admin.user_fields.save}}</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> <button {{action "cancel"}} class='btn btn-danger'>{{fa-icon 'times'}} {{i18n 'admin.user_fields.cancel'}}</button>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class='form-element'> <div class='form-element'>
<label> <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> </label>
</div> </div>
<div class='form-element'> <div class='form-element'>
<label> <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> </label>
</div> </div>
</div> </div>
@ -41,8 +41,8 @@
<div class='form-display'> <div class='form-display'>
</div> </div>
<div class='form-element controls'> <div class='form-element controls'>
<button {{action "edit"}}class='btn btn-default'>{{fa-icon 'pencil'}} {{i18n admin.user_fields.edit}}</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> <button {{action "destroy"}}class='btn btn-danger'>{{fa-icon 'trash-o'}} {{i18n 'admin.user_fields.delete'}}</button>
</div> </div>
</div> </div>
<div class="row">{{f.flags}}</div> <div class="row">{{f.flags}}</div>
@ -53,6 +53,6 @@
<button {{bind-attr disabled="createDisabled"}} class='btn btn-primary' {{action "createField"}}> <button {{bind-attr disabled="createDisabled"}} class='btn btn-primary' {{action "createField"}}>
{{fa-icon "plus"}} {{fa-icon "plus"}}
{{i18n admin.user_fields.create}} {{i18n 'admin.user_fields.create'}}
</button> </button>
</div> </div>

18
app/assets/javascripts/admin/templates/user_badges.hbs
View file

@ -8,26 +8,26 @@
{{#loading-spinner condition=loading}} {{#loading-spinner condition=loading}}
<div class='admin-container user-badges'> <div class='admin-container user-badges'>
<h2>{{i18n admin.badges.grant_badge}}</h2> <h2>{{i18n 'admin.badges.grant_badge'}}</h2>
{{#if noBadges}} {{#if noBadges}}
<p>{{i18n admin.badges.no_badges}}</p> <p>{{i18n 'admin.badges.no_badges'}}</p>
{{else}} {{else}}
<br> <br>
{{combo-box valueAttribute="id" value=controller.selectedBadgeId content=controller.grantableBadges}} {{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}} {{/if}}
<br> <br>
<br> <br>
<h2>{{i18n admin.badges.granted_badges}}</h2> <h2>{{i18n 'admin.badges.granted_badges'}}</h2>
<br> <br>
<table> <table>
<tr> <tr>
<th>{{i18n admin.badges.badge}}</th> <th>{{i18n 'admin.badges.badge'}}</th>
<th>{{i18n admin.badges.granted_by}}</th> <th>{{i18n 'admin.badges.granted_by'}}</th>
<th>{{i18n admin.badges.granted_at}}</th> <th>{{i18n 'admin.badges.granted_at'}}</th>
<th></th> <th></th>
</tr> </tr>
@ -42,13 +42,13 @@
</td> </td>
<td>{{age-with-tooltip granted_at}}</td> <td>{{age-with-tooltip granted_at}}</td>
<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> </td>
</tr> </tr>
{{else}} {{else}}
<tr> <tr>
<td colspan="5"> <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> </td>
</tr> </tr>
{{/each}} {{/each}}

164
app/assets/javascripts/admin/templates/user_index.hbs
View file

@ -4,68 +4,68 @@
{{#if active}} {{#if active}}
{{#link-to 'user' model class="btn"}} {{#link-to 'user' model class="btn"}}
<i class='fa fa-user'></i> <i class='fa fa-user'></i>
{{i18n admin.user.show_public_profile}} {{i18n 'admin.user.show_public_profile'}}
{{/link-to}} {{/link-to}}
{{#if can_impersonate}} {{#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> <i class='fa fa-crosshairs'></i>
{{i18n admin.impersonate.title}} {{i18n 'admin.impersonate.title'}}
</button> </button>
{{/if}} {{/if}}
{{#if currentUser.admin}} {{#if currentUser.admin}}
<button class='btn' {{action "log_out" target="content"}}> <button class='btn' {{action "log_out" target="content"}}>
<i class='fa fa-power-off'></i> <i class='fa fa-power-off'></i>
{{i18n admin.user.log_out}} {{i18n 'admin.user.log_out'}}
</button> </button>
{{/if}} {{/if}}
{{/if}} {{/if}}
</div> </div>
<div class='display-row username'> <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='value'>{{username}}</div>
<div class='controls'> <div class='controls'>
{{#link-to 'preferences.username' model class="btn"}} {{#link-to 'preferences.username' model class="btn"}}
<i class='fa fa-pencil'></i> <i class='fa fa-pencil'></i>
{{i18n user.change_username.title}} {{i18n 'user.change_username.title'}}
{{/link-to}} {{/link-to}}
</div> </div>
</div> </div>
{{#if canCheckEmails}} {{#if canCheckEmails}}
<div class='display-row email'> <div class='display-row email'>
<div class='field'>{{i18n user.email.title}}</div> <div class='field'>{{i18n 'user.email.title'}}</div>
<div class='value'> <div class='value'>
{{#unless active}} {{#unless active}}
<div class='controls'>{{i18n admin.users.not_verified}}</div> <div class='controls'>{{i18n 'admin.users.not_verified'}}</div>
{{/unless}} {{/unless}}
{{#if email}} {{#if email}}
<a href="mailto:{{unbound email}}">{{email}}</a> <a href="mailto:{{unbound email}}">{{email}}</a>
{{else}} {{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}} {{/if}}
</div> </div>
</div> </div>
<div class='display-row associations'> <div class='display-row associations'>
<div class='field'>{{i18n user.associated_accounts}}</div> <div class='field'>{{i18n 'user.associated_accounts'}}</div>
<div class='value'> <div class='value'>
{{#if associated_accounts}} {{#if associated_accounts}}
{{associated_accounts}} {{associated_accounts}}
{{else}} {{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}} {{/if}}
</div> </div>
</div> </div>
{{/if}} {{/if}}
<div class='display-row'> <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 class='value'>{{avatar content imageSize="large"}}</div>
</div> </div>
<div class='display-row'> <div class='display-row'>
<div class='field'>{{i18n user.title.title}}</div> <div class='field'>{{i18n 'user.title.title'}}</div>
<div class='value'> <div class='value'>
{{#if editingTitle}} {{#if editingTitle}}
{{text-field value=title autofocus="autofocus"}} {{text-field value=title autofocus="autofocus"}}
@ -75,23 +75,23 @@
</div> </div>
<div class='controls'> <div class='controls'>
{{#if editingTitle}} {{#if editingTitle}}
<button class='btn' {{action "saveTitle"}}>{{i18n admin.user.save_title}}</button> <button class='btn' {{action "saveTitle"}}>{{i18n 'admin.user.save_title'}}</button>
<a href="#" {{action "toggleTitleEdit"}}>{{i18n cancel}}</a> <a href="#" {{action "toggleTitleEdit"}}>{{i18n 'cancel'}}</a>
{{else}} {{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}} {{/if}}
</div> </div>
</div> </div>
{{#if currentUser.admin}} {{#if currentUser.admin}}
<div class='display-row'> <div class='display-row'>
<div class='field'>{{i18n admin.groups.title}}</div> <div class='field'>{{i18n 'admin.groups.title'}}</div>
<div class='value'> <div class='value'>
{{admin-group-selector selected=model.groups available=availableGroups}} {{admin-group-selector selected=model.groups available=availableGroups}}
</div> </div>
<div class='controls'> <div class='controls'>
{{#if custom_groups}} {{#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"}} {{combo-box content=custom_groups value=primary_group_id nameProperty="name" none="admin.groups.no_primary"}}
{{/if}} {{/if}}
{{#if primaryGroupDirty}} {{#if primaryGroupDirty}}
@ -103,12 +103,12 @@
{{/if}} {{/if}}
<div class='display-row'> <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='value'>{{ip_address}}</div>
<div class='controls'> <div class='controls'>
{{#if currentUser.staff}} {{#if currentUser.staff}}
<button class='btn' {{action "refreshBrowsers" target="content"}}> <button class='btn' {{action "refreshBrowsers" target="content"}}>
{{i18n admin.user.refresh_browsers}} {{i18n 'admin.user.refresh_browsers'}}
</button> </button>
{{ip-lookup ip=ip_address userId=id}} {{ip-lookup ip=ip_address userId=id}}
{{/if}} {{/if}}
@ -116,7 +116,7 @@
</div> </div>
<div class='display-row'> <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='value'>{{registration_ip_address}}</div>
<div class='controls'> <div class='controls'>
{{#if currentUser.staff}} {{#if currentUser.staff}}
@ -127,12 +127,12 @@
{{#if showBadges}} {{#if showBadges}}
<div class='display-row'> <div class='display-row'>
<div class='field'>{{i18n admin.badges.title}}</div> <div class='field'>{{i18n 'admin.badges.title'}}</div>
<div class='value'> <div class='value'>
{{i18n badges.badge_count count=badge_count}} {{i18n 'badges.badge_count' count=badge_count}}
</div> </div>
<div class='controls'> <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>
</div> </div>
{{/if}} {{/if}}
@ -157,30 +157,30 @@
<section class='details'> <section class='details'>
<h1>{{i18n admin.user.permissions}}</h1> <h1>{{i18n 'admin.user.permissions'}}</h1>
{{#if showApproval}} {{#if showApproval}}
<div class='display-row'> <div class='display-row'>
<div class='field'>{{i18n admin.users.approved}}</div> <div class='field'>{{i18n 'admin.users.approved'}}</div>
<div class='value'> <div class='value'>
{{#if approved}} {{#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}}{{avatar approvedBy imageSize="small"}}{{/link-to}}
{{#link-to 'adminUser' approvedBy}}{{approvedBy.username}}{{/link-to}} {{#link-to 'adminUser' approvedBy}}{{approvedBy.username}}{{/link-to}}
{{else}} {{else}}
{{i18n no_value}} {{i18n 'no_value'}}
{{/if}} {{/if}}
</div> </div>
<div class='controls'> <div class='controls'>
{{#if approved}} {{#if approved}}
{{i18n admin.user.approve_success}} {{i18n 'admin.user.approve_success'}}
{{else}} {{else}}
{{#if can_approve}} {{#if can_approve}}
<button class='btn' {{action "approve" target="content"}}> <button class='btn' {{action "approve" target="content"}}>
<i class='fa fa-check'></i> <i class='fa fa-check'></i>
{{i18n admin.user.approve}} {{i18n 'admin.user.approve'}}
</button> </button>
{{/if}} {{/if}}
{{/if}} {{/if}}
@ -189,31 +189,31 @@
{{/if}} {{/if}}
<div class='display-row'> <div class='display-row'>
<div class='field'>{{i18n admin.users.active}}</div> <div class='field'>{{i18n 'admin.users.active'}}</div>
<div class='value'> <div class='value'>
{{#if active}} {{#if active}}
{{i18n yes_value}} {{i18n 'yes_value'}}
{{else}} {{else}}
{{i18n no_value}} {{i18n 'no_value'}}
{{/if}} {{/if}}
</div> </div>
<div class='controls'> <div class='controls'>
{{#if active}} {{#if active}}
{{#if can_deactivate}} {{#if can_deactivate}}
<button class='btn' {{action "deactivate" target="content"}}>{{i18n admin.user.deactivate_account}}</button> <button class='btn' {{action "deactivate" target="content"}}>{{i18n 'admin.user.deactivate_account'}}</button>
{{i18n admin.user.deactivate_explanation}} {{i18n 'admin.user.deactivate_explanation'}}
{{/if}} {{/if}}
{{else}} {{else}}
{{#if can_send_activation_email}} {{#if can_send_activation_email}}
<button class='btn' {{action "sendActivationEmail" target="content"}}> <button class='btn' {{action "sendActivationEmail" target="content"}}>
<i class='fa fa-envelope'></i> <i class='fa fa-envelope'></i>
{{i18n admin.user.send_activation_email}} {{i18n 'admin.user.send_activation_email'}}
</button> </button>
{{/if}} {{/if}}
{{#if can_activate}} {{#if can_activate}}
<button class='btn' {{action "activate" target="content"}}> <button class='btn' {{action "activate" target="content"}}>
<i class='fa fa-check'></i> <i class='fa fa-check'></i>
{{i18n admin.user.activate}} {{i18n 'admin.user.activate'}}
</button> </button>
{{/if}} {{/if}}
{{/if}} {{/if}}
@ -221,57 +221,57 @@
</div> </div>
<div class='display-row'> <div class='display-row'>
<div class='field'>{{i18n admin.api.key}}</div> <div class='field'>{{i18n 'admin.api.key'}}</div>
{{#if api_key}} {{#if api_key}}
<div class='long-value'> <div class='long-value'>
{{api_key.key}} {{api_key.key}}
<button class='btn' {{action "regenerateApiKey"}}><i class="fa fa-undo"></i>{{i18n admin.api.regenerate}}</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> <button {{action "revokeApiKey"}} class="btn"><i class="fa fa-times"></i>{{i18n 'admin.api.revoke'}}</button>
</div> </div>
{{else}} {{else}}
<div class='value'> <div class='value'>
&mdash; &mdash;
</div> </div>
<div class='controls'> <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> </div>
{{/if}} {{/if}}
</div> </div>
<div class='display-row'> <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='value'>{{admin}}</div>
<div class='controls'> <div class='controls'>
{{#if can_revoke_admin}} {{#if can_revoke_admin}}
<button class='btn' {{action "revokeAdmin" target="content"}}> <button class='btn' {{action "revokeAdmin" target="content"}}>
<i class='fa fa-shield'></i> <i class='fa fa-shield'></i>
{{i18n admin.user.revoke_admin}} {{i18n 'admin.user.revoke_admin'}}
</button> </button>
{{/if}} {{/if}}
{{#if can_grant_admin}} {{#if can_grant_admin}}
<button class='btn' {{action "grantAdmin" target="content"}}> <button class='btn' {{action "grantAdmin" target="content"}}>
<i class='fa fa-shield'></i> <i class='fa fa-shield'></i>
{{i18n admin.user.grant_admin}} {{i18n 'admin.user.grant_admin'}}
</button> </button>
{{/if}} {{/if}}
</div> </div>
</div> </div>
<div class='display-row'> <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='value'>{{moderator}}</div>
<div class='controls'> <div class='controls'>
{{#if can_revoke_moderation}} {{#if can_revoke_moderation}}
<button class='btn' {{action "revokeModeration" target="content"}}> <button class='btn' {{action "revokeModeration" target="content"}}>
<i class='fa fa-shield'></i> <i class='fa fa-shield'></i>
{{i18n admin.user.revoke_moderation}} {{i18n 'admin.user.revoke_moderation'}}
</button> </button>
{{/if}} {{/if}}
{{#if can_grant_moderation}} {{#if can_grant_moderation}}
<button class='btn' {{action "grantModeration" target="content"}}> <button class='btn' {{action "grantModeration" target="content"}}>
<i class='fa fa-shield'></i> <i class='fa fa-shield'></i>
{{i18n admin.user.grant_moderation}} {{i18n 'admin.user.grant_moderation'}}
</button> </button>
{{/if}} {{/if}}
</div> </div>
@ -279,7 +279,7 @@
</div> </div>
<div class='display-row'> <div class='display-row'>
<div class='field'>{{i18n trust_level}}</div> <div class='field'>{{i18n 'trust_level'}}</div>
<div class="value"> <div class="value">
{{combo-box content=trustLevels value=trust_level nameProperty="detailedName"}} {{combo-box content=trustLevels value=trust_level nameProperty="detailedName"}}
{{#if dirty}} {{#if dirty}}
@ -292,36 +292,36 @@
<div class="controls"> <div class="controls">
{{#if model.canLockTrustLevel}} {{#if model.canLockTrustLevel}}
{{#if model.trust_level_locked}} {{#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}} {{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}} {{/if}}
{{#if tl3Requirements}} {{#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}} {{/if}}
</div> </div>
</div> </div>
<div {{bind-attr class=":display-row isSuspended:highlight-danger"}}> <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='value'>{{isSuspended}}</div>
<div class='controls'> <div class='controls'>
{{#if isSuspended}} {{#if isSuspended}}
<button class='btn btn-danger' {{action "unsuspend" target="content"}}> <button class='btn btn-danger' {{action "unsuspend" target="content"}}>
<i class='fa fa-ban'></i> <i class='fa fa-ban'></i>
{{i18n admin.user.unsuspend}} {{i18n 'admin.user.unsuspend'}}
</button> </button>
{{suspendDuration}} {{suspendDuration}}
{{i18n admin.user.suspended_explanation}} {{i18n 'admin.user.suspended_explanation'}}
{{else}} {{else}}
{{#if canSuspend}} {{#if canSuspend}}
<button class='btn btn-danger' {{action "showSuspendModal" this}}> <button class='btn btn-danger' {{action "showSuspendModal" this}}>
<i class='fa fa-ban'></i> <i class='fa fa-ban'></i>
{{i18n admin.user.suspend}} {{i18n 'admin.user.suspend'}}
</button> </button>
{{i18n admin.user.suspended_explanation}} {{i18n 'admin.user.suspended_explanation'}}
{{/if}} {{/if}}
{{/if}} {{/if}}
</div> </div>
@ -329,64 +329,64 @@
{{#if isSuspended}} {{#if isSuspended}}
<div class='display-row highlight-danger'> <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'> <div class='value'>
{{#link-to 'adminUser' suspendedBy}}{{avatar suspendedBy imageSize="tiny"}}{{/link-to}} {{#link-to 'adminUser' suspendedBy}}{{avatar suspendedBy imageSize="tiny"}}{{/link-to}}
{{#link-to 'adminUser' suspendedBy}}{{suspendedBy.username}}{{/link-to}} {{#link-to 'adminUser' suspendedBy}}{{suspendedBy.username}}{{/link-to}}
</div> </div>
<div class='controls'> <div class='controls'>
<b>{{i18n admin.user.suspend_reason}}</b>: <b>{{i18n 'admin.user.suspend_reason'}}</b>:
{{suspend_reason}} {{suspend_reason}}
</div> </div>
</div> </div>
{{/if}} {{/if}}
<div class='display-row' {{bind-attr class=":display-row blocked:highlight-danger"}}> <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='value'>{{blocked}}</div>
<div class='controls'> <div class='controls'>
{{#if blocked}} {{#if blocked}}
<button class='btn' {{action "unblock" target="content"}}> <button class='btn' {{action "unblock" target="content"}}>
<i class='fa fa-thumbs-o-up'></i> <i class='fa fa-thumbs-o-up'></i>
{{i18n admin.user.unblock}} {{i18n 'admin.user.unblock'}}
</button> </button>
{{i18n admin.user.block_explanation}} {{i18n 'admin.user.block_explanation'}}
{{/if}} {{/if}}
</div> </div>
</div> </div>
</section> </section>
<section class='details'> <section class='details'>
<h1>{{i18n admin.user.activity}}</h1> <h1>{{i18n 'admin.user.activity'}}</h1>
<div class='display-row'> <div class='display-row'>
<div class='field'>{{i18n created}}</div> <div class='field'>{{i18n 'created'}}</div>
<div class='value'>{{{created_at_age}}}</div> <div class='value'>{{{created_at_age}}}</div>
</div> </div>
<div class='display-row'> <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 class='value'>{{{last_emailed_age}}}</div>
</div> </div>
<div class='display-row'> <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 class='value'>{{{last_seen_age}}}</div>
</div> </div>
<div class='display-row'> <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 class='value'>{{like_given_count}} / {{like_count}}</div>
</div> </div>
<div class='display-row'> <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 class='value'>{{topics_entered}}</div>
</div> </div>
<div class='display-row'> <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='value'>{{post_count}}</div>
<div class='controls'> <div class='controls'>
{{#if can_delete_all_posts}} {{#if can_delete_all_posts}}
<button class='btn btn-danger' {{action "deleteAllPosts" target="content"}}> <button class='btn btn-danger' {{action "deleteAllPosts" target="content"}}>
<i class='fa fa-trash-o'></i> <i class='fa fa-trash-o'></i>
{{i18n admin.user.delete_all_posts}} {{i18n 'admin.user.delete_all_posts'}}
</button> </button>
{{else}} {{else}}
{{deleteAllPostsExplanation}} {{deleteAllPostsExplanation}}
@ -394,54 +394,54 @@
</div> </div>
</div> </div>
<div class='display-row'> <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 class='value'>{{posts_read_count}}</div>
</div> </div>
<div class='display-row'> <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 class='value'>{{warnings_received_count}}</div>
</div> </div>
<div class='display-row'> <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 class='value'>{{flags_given_count}} / {{flags_received_count}}</div>
</div> </div>
<div class='display-row'> <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 class='value'>{{private_topics_count}}</div>
</div> </div>
<div class='display-row'> <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 class='value'>{{{time_read}}}</div>
</div> </div>
<div class='display-row'> <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 class='value'>{{{days_visited}}}</div>
</div> </div>
</section> </section>
{{#if single_sign_on_record}} {{#if single_sign_on_record}}
<section class='details'> <section class='details'>
<h1>{{i18n admin.user.sso.title}}</h1> <h1>{{i18n 'admin.user.sso.title'}}</h1>
{{#with single_sign_on_record}} {{#with single_sign_on_record}}
<div class='display-row'> <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 class='value'>{{external_id}}</div>
</div> </div>
<div class='display-row'> <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 class='value'>{{external_username}}</div>
</div> </div>
<div class='display-row'> <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 class='value'>{{external_name}}</div>
</div> </div>
<div class='display-row'> <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 class='value'>{{external_email}}</div>
</div> </div>
<div class='display-row'> <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 class='value'>{{external_avatar_url}}</div>
</div> </div>
{{/with}} {{/with}}
@ -452,7 +452,7 @@
<hr/> <hr/>
<button {{bind-attr class=":btn :btn-danger :pull-right deleteForbidden:hidden"}} {{action "destroy" target="content"}} {{bind-attr disabled="deleteForbidden"}}> <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> <i class="fa fa-exclamation-triangle"></i>
{{i18n admin.user.delete}} {{i18n 'admin.user.delete'}}
</button> </button>
{{#if deleteExplanation}} {{#if deleteExplanation}}
<div class="clearfix"></div> <div class="clearfix"></div>

60
app/assets/javascripts/admin/templates/user_tl3_requirements.hbs
View file

@ -2,15 +2,15 @@
<div class='span15'> <div class='span15'>
<ul class="nav nav-pills"> <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 '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> </ul>
</div> </div>
</div> </div>
<div class="admin-container tl3-requirements"> <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/> <br/>
<p>{{i18n admin.user.tl3_requirements.table_title}}</p> <p>{{i18n 'admin.user.tl3_requirements.table_title'}}</p>
{{#with tl3Requirements}} {{#with tl3Requirements}}
<table class="table" style="width: auto;"> <table class="table" style="width: auto;">
@ -18,81 +18,81 @@
<tr> <tr>
<th></th> <th></th>
<th></th> <th></th>
<th>{{i18n admin.user.tl3_requirements.value_heading}}</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.requirement_heading'}}</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr> <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><i {{bind-attr class=":fa met.days_visited:fa-check:fa-times"}}></i></td>
<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>
<td>{{min_days_visited_percent}}%</td> <td>{{min_days_visited_percent}}%</td>
</tr> </tr>
<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><i {{bind-attr class=":fa met.topics_replied_to:fa-check:fa-times"}}></i></td>
<td>{{num_topics_replied_to}}</td> <td>{{num_topics_replied_to}}</td>
<td>{{min_topics_replied_to}}</td> <td>{{min_topics_replied_to}}</td>
</tr> </tr>
<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><i {{bind-attr class=":fa met.topics_viewed:fa-check:fa-times"}}></i></td>
<td>{{topics_viewed}}</td> <td>{{topics_viewed}}</td>
<td>{{min_topics_viewed}}</td> <td>{{min_topics_viewed}}</td>
</tr> </tr>
<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><i {{bind-attr class=":fa met.topics_viewed_all_time:fa-check:fa-times"}}></i></td>
<td>{{topics_viewed_all_time}}</td> <td>{{topics_viewed_all_time}}</td>
<td>{{min_topics_viewed_all_time}}</td> <td>{{min_topics_viewed_all_time}}</td>
</tr> </tr>
<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><i {{bind-attr class=":fa met.posts_read:fa-check:fa-times"}}></i></td>
<td>{{posts_read}}</td> <td>{{posts_read}}</td>
<td>{{min_posts_read}}</td> <td>{{min_posts_read}}</td>
</tr> </tr>
<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><i {{bind-attr class=":fa met.posts_read_all_time:fa-check:fa-times"}}></i></td>
<td>{{posts_read_all_time}}</td> <td>{{posts_read_all_time}}</td>
<td>{{min_posts_read_all_time}}</td> <td>{{min_posts_read_all_time}}</td>
</tr> </tr>
<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><i {{bind-attr class=":fa met.flagged_posts:fa-check:fa-times"}}></i></td>
<td>{{num_flagged_posts}}</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>
<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><i {{bind-attr class=":fa met.flagged_by_users:fa-check:fa-times"}}></i></td>
<td>{{num_flagged_by_users}}</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>
<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><i {{bind-attr class=":fa met.likes_given:fa-check:fa-times"}}></i></td>
<td>{{num_likes_given}}</td> <td>{{num_likes_given}}</td>
<td>{{min_likes_given}}</td> <td>{{min_likes_given}}</td>
</tr> </tr>
<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><i {{bind-attr class=":fa met.likes_received:fa-check:fa-times"}}></i></td>
<td>{{num_likes_received}}</td> <td>{{num_likes_received}}</td>
<td>{{min_likes_received}}</td> <td>{{min_likes_received}}</td>
</tr> </tr>
<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><i {{bind-attr class=":fa met.likes_received_days:fa-check:fa-times"}}></i></td>
<td>{{num_likes_received_days}}</td> <td>{{num_likes_received_days}}</td>
<td>{{min_likes_received_days}}</td> <td>{{min_likes_received_days}}</td>
</tr> </tr>
<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><i {{bind-attr class=":fa met.likes_received_users:fa-check:fa-times"}}></i></td>
<td>{{num_likes_received_users}}</td> <td>{{num_likes_received_users}}</td>
<td>{{min_likes_received_users}}</td> <td>{{min_likes_received_users}}</td>
@ -107,31 +107,31 @@
{{#if tl3Requirements.requirements_lost}} {{#if tl3Requirements.requirements_lost}}
{{! tl implicitly not locked }} {{! tl implicitly not locked }}
{{#if tl3Requirements.on_grace_period}} {{#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 }} {{else}} {{! not on grace period }}
<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'}}
{{i18n admin.user.tl3_requirements.will_be_demoted}} {{i18n 'admin.user.tl3_requirements.will_be_demoted'}}
{{/if}} {{/if}}
{{else}} {{! requirements not lost - remains tl3 }} {{else}} {{! requirements not lost - remains tl3 }}
{{#if tl3Requirements.trust_level_locked}} {{#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 }} {{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}} {{#if tl3Requirements.on_grace_period}}
{{i18n admin.user.tl3_requirements.on_grace_period}} {{i18n 'admin.user.tl3_requirements.on_grace_period'}}
{{/if}} {{/if}}
{{/if}} {{/if}}
{{/if}} {{/if}}
{{else}} {{! is not tl3 }} {{else}} {{! is not tl3 }}
{{#if tl3Requirements.requirements_met}} {{#if tl3Requirements.requirements_met}}
{{! met & not tl3 - will be promoted}} {{! met & not tl3 - will be promoted}}
<i class="fa fa-check"></i> {{i18n admin.user.tl3_requirements.qualifies}} <i class="fa fa-check"></i> {{i18n 'admin.user.tl3_requirements.qualifies'}}
{{i18n admin.user.tl3_requirements.will_be_promoted}} {{i18n 'admin.user.tl3_requirements.will_be_promoted'}}
{{else}} {{! requirements not met - remains regular }} {{else}} {{! requirements not met - remains regular }}
{{#if tl3Requirements.trust_level_locked}} {{#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}} {{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}} {{/if}}
{{/if}} {{/if}}

30
app/assets/javascripts/admin/templates/users-list-show.hbs
View file

@ -14,7 +14,7 @@
{{text-field value=listFilter placeholder=searchHint}} {{text-field value=listFilter placeholder=searchHint}}
{{#unless showEmails}} {{#unless showEmails}}
<div class="pull-right"> <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> </div>
{{/unless}} {{/unless}}
</div> </div>
@ -27,16 +27,16 @@
<th>{{input type="checkbox" checked=selectAll}}</th> <th>{{input type="checkbox" checked=selectAll}}</th>
{{/if}} {{/if}}
<th>&nbsp;</th> <th>&nbsp;</th>
<th>{{i18n username}}</th> <th>{{i18n 'username'}}</th>
<th>{{i18n email}}</th> <th>{{i18n 'email'}}</th>
<th>{{i18n admin.users.last_emailed}}</th> <th>{{i18n 'admin.users.last_emailed'}}</th>
<th>{{i18n last_seen}}</th> <th>{{i18n 'last_seen'}}</th>
<th>{{i18n admin.user.topics_entered}}</th> <th>{{i18n 'admin.user.topics_entered'}}</th>
<th>{{i18n admin.user.posts_read_count}}</th> <th>{{i18n 'admin.user.posts_read_count'}}</th>
<th>{{i18n admin.user.time_read}}</th> <th>{{i18n 'admin.user.time_read'}}</th>
<th>{{i18n created}}</th> <th>{{i18n 'created'}}</th>
{{#if showApproval}} {{#if showApproval}}
<th>{{i18n admin.users.approved}}</th> <th>{{i18n 'admin.users.approved'}}</th>
{{/if}} {{/if}}
<th>&nbsp;</th> <th>&nbsp;</th>
</tr> </tr>
@ -64,21 +64,21 @@
{{#if showApproval}} {{#if showApproval}}
<td> <td>
{{#if user.approved}} {{#if user.approved}}
{{i18n yes_value}} {{i18n 'yes_value'}}
{{else}} {{else}}
{{i18n no_value}} {{i18n 'no_value'}}
{{/if}} {{/if}}
</td> </td>
{{/if}} {{/if}}
<td> <td>
{{#if user.admin}}<i class="fa fa-shield" title="{{i18n admin.title}}"></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}} {{#if user.moderator}}<i class="fa fa-shield" title="{{i18n 'admin.moderator'}}"></i>{{/if}}
</td> </td>
</tr> </tr>
{{/each}} {{/each}}
</table> </table>
{{else}} {{else}}
<p>{{i18n search.no_results}}</p> <p>{{i18n 'search.no_results'}}</p>
{{/if}} {{/if}}
{{/loading-spinner}} {{/loading-spinner}}

16
app/assets/javascripts/admin/templates/users_list.hbs
View file

@ -1,19 +1,19 @@
<div class='admin-controls'> <div class='admin-controls'>
<div class='span15'> <div class='span15'>
<ul class="nav nav-pills"> <ul class="nav nav-pills">
<li>{{#link-to 'adminUsersList.show' 'active'}}{{i18n admin.users.nav.active}}{{/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> <li>{{#link-to 'adminUsersList.show' 'new'}}{{i18n 'admin.users.nav.new'}}{{/link-to}}</li>
{{#if siteSettings.must_approve_users}} {{#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}} {{/if}}
<li>{{#link-to 'adminUsersList.show' 'staff'}}{{i18n admin.users.nav.staff}}{{/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' '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' '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' 'suspect'}}{{i18n 'admin.users.nav.suspect'}}{{/link-to}}</li>
</ul> </ul>
</div> </div>
<div class="pull-right"> <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>
</div> </div>

20
app/assets/javascripts/admin/templates/version_checks.hbs
View file

@ -5,15 +5,15 @@
{{custom-html 'upgrade-header'}} {{custom-html 'upgrade-header'}}
<tr> <tr>
<th>&nbsp;</th> <th>&nbsp;</th>
<th>{{i18n admin.dashboard.installed_version}}</th> <th>{{i18n 'admin.dashboard.installed_version'}}</th>
<th>{{i18n admin.dashboard.latest_version}}</th> <th>{{i18n 'admin.dashboard.latest_version'}}</th>
<th>&nbsp;</th> <th>&nbsp;</th>
<th>&nbsp;</th> <th>&nbsp;</th>
</tr> </tr>
</thead> </thead>
{{#unless loading}} {{#unless loading}}
<tbody> <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> <td class="version-number"><a {{bind-attr href="versionCheck.gitLink"}} target="_blank">{{ versionCheck.installed_version }}</a></td>
{{#if versionCheck.noCheckPerformed}} {{#if versionCheck.noCheckPerformed}}
@ -22,7 +22,7 @@
<span class="icon critical-updates-available">☹</span> <span class="icon critical-updates-available">☹</span>
</td> </td>
<td class="version-notes"> <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> </td>
{{else}} {{else}}
{{#if versionCheck.staleData}} {{#if versionCheck.staleData}}
@ -37,9 +37,9 @@
<td class="version-notes"> <td class="version-notes">
<span class="normal-note"> <span class="normal-note">
{{#if versionCheck.version_check_pending}} {{#if versionCheck.version_check_pending}}
{{i18n admin.dashboard.version_check_pending}} {{i18n 'admin.dashboard.version_check_pending'}}
{{else}} {{else}}
{{i18n admin.dashboard.stale_data}} {{i18n 'admin.dashboard.stale_data'}}
{{/if}} {{/if}}
</span> </span>
</td> </td>
@ -60,11 +60,11 @@
</td> </td>
<td class="version-notes"> <td class="version-notes">
{{#if versionCheck.upToDate }} {{#if versionCheck.upToDate }}
{{i18n admin.dashboard.up_to_date}} {{i18n 'admin.dashboard.up_to_date'}}
{{else}} {{else}}
<span class="critical-note">{{i18n admin.dashboard.critical_available}}</span> <span class="critical-note">{{i18n 'admin.dashboard.critical_available'}}</span>
<span class="normal-note">{{i18n admin.dashboard.updates_available}}</span> <span class="normal-note">{{i18n 'admin.dashboard.updates_available'}}</span>
{{i18n admin.dashboard.please_upgrade}} {{i18n 'admin.dashboard.please_upgrade'}}
{{/if}} {{/if}}
</td> </td>
{{/if}} {{/if}}

6
app/assets/javascripts/discourse/helpers/i18n_helpers.js
View file

@ -26,7 +26,11 @@ I18n.toHumanSize = function(number, options) {
Handlebars.registerHelper('i18n', function(property, options) { Handlebars.registerHelper('i18n', function(property, options) {
// Resolve any properties // Resolve any properties
var params = options.hash, 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) { _.each(params, function(value, key) {
params[key] = Em.Handlebars.get(self, value, options); params[key] = Em.Handlebars.get(self, value, options);

20
app/assets/javascripts/discourse/templates/about.hbs
View file

@ -1,12 +1,12 @@
<div class='container body-page'> <div class='container body-page'>
<section class='about'> <section class='about'>
<h2>{{i18n about.title title=title}}</h2> <h2>{{i18n 'about.title' title=title}}</h2>
<p>{{description}}</p> <p>{{description}}</p>
</section> </section>
{{#if admins}} {{#if admins}}
<section class='about admins'> <section class='about admins'>
<h3>{{i18n about.our_admins}}</h3> <h3>{{i18n 'about.our_admins'}}</h3>
{{#each admins}} {{#each admins}}
{{user-small user=this}} {{user-small user=this}}
@ -18,7 +18,7 @@
{{#if moderators}} {{#if moderators}}
<section class='about moderators'> <section class='about moderators'>
<h3>{{i18n about.our_moderators}}</h3> <h3>{{i18n 'about.our_moderators'}}</h3>
<div class='users'> <div class='users'>
{{#each moderators}} {{#each moderators}}
@ -30,31 +30,31 @@
{{/if}} {{/if}}
<section class='about stats'> <section class='about stats'>
<h3>{{i18n about.stats}}</h3> <h3>{{i18n 'about.stats'}}</h3>
<table class='table'> <table class='table'>
<tr> <tr>
<th>&nbsp;</th> <th>&nbsp;</th>
<th>{{i18n about.stat.all_time}}</th> <th>{{i18n 'about.stat.all_time'}}</th>
<th>{{i18n about.stat.last_7_days}}</th> <th>{{i18n 'about.stat.last_7_days'}}</th>
</tr> </tr>
<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.topic_count}}</td>
<td>{{number stats.topics_7_days}}</td> <td>{{number stats.topics_7_days}}</td>
</tr> </tr>
<tr> <tr>
<td>{{i18n about.post_count}}</td> <td>{{i18n 'about.post_count'}}</td>
<td>{{number stats.post_count}}</td> <td>{{number stats.post_count}}</td>
<td>{{number stats.posts_7_days}}</td> <td>{{number stats.posts_7_days}}</td>
</tr> </tr>
<tr> <tr>
<td>{{i18n about.user_count}}</td> <td>{{i18n 'about.user_count'}}</td>
<td>{{number stats.user_count}}</td> <td>{{number stats.user_count}}</td>
<td>{{number stats.users_7_days}}</td> <td>{{number stats.users_7_days}}</td>
</tr> </tr>
<tr> <tr>
<td>{{i18n about.like_count}}</td> <td>{{i18n 'about.like_count'}}</td>
<td>{{number stats.like_count}}</td> <td>{{number stats.like_count}}</td>
<td>{{number stats.likes_7_days}}</td> <td>{{number stats.likes_7_days}}</td>
</tr> </tr>

4
app/assets/javascripts/discourse/templates/badges/index.hbs
View file

@ -1,5 +1,5 @@
<div class='container badges'> <div class='container badges'>
<h1>{{i18n badges.title}}</h1> <h1>{{i18n 'badges.title'}}</h1>
<table class='badges-listing'> <table class='badges-listing'>
<tbody> <tbody>
@ -12,7 +12,7 @@
<td class='granted'>{{#if this.has_badge}}<i class='fa fa-check'></i>{{/if}}</td> <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='badge'>{{user-badge badge=this}}</td>
<td class='description'>{{{displayDescriptionHtml}}}</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> </tr>
{{/each}} {{/each}}
{{/each}} {{/each}}

6
app/assets/javascripts/discourse/templates/badges/show.hbs
View file

@ -1,6 +1,6 @@
<div class='container show-badge'> <div class='container show-badge'>
<h1> <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> <i class='fa fa-angle-right'></i>
{{displayName}} {{displayName}}
</h1> </h1>
@ -10,8 +10,8 @@
<tr> <tr>
<td class='badge'>{{user-badge badge=this}}</td> <td class='badge'>{{user-badge badge=this}}</td>
<td class='description'>{{displayDescription}}</td> <td class='description'>{{displayDescription}}</td>
<td class='grant-count'>{{i18n badges.granted count=grant_count}}</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='info'>{{i18n 'badges.allow_title'}} {{{view.allowTitle}}}<br>{{i18n 'badges.multiple_grant'}} {{{view.multipleGrant}}}
</td> </td>
</tr> </tr>
</tbody> </tbody>

6
app/assets/javascripts/discourse/templates/choose_topic.hbs
View file

@ -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"}} {{text-field value=view.topicTitle placeholderKey="choose_topic.title.placeholder" id="choose-topic-title"}}
{{#if view.loading}} {{#if view.loading}}
<p>{{i18n loading}}</p> <p>{{i18n 'loading'}}</p>
{{else}} {{else}}
{{#if view.noResults}} {{#if view.noResults}}
<p>{{i18n choose_topic.none_found}}</p> <p>{{i18n 'choose_topic.none_found'}}</p>
{{else}} {{else}}
{{#each view.topics}} {{#each view.topics}}
<div class='controls'> <div class='controls'>

4
app/assets/javascripts/discourse/templates/components/auto-close-form.hbs
View file

@ -2,7 +2,7 @@
<div> <div>
<label> <label>
{{fa-icon clock-o}} {{fa-icon clock-o}}
{{i18n composer.auto_close.label}} {{i18n 'composer.auto_close.label'}}
{{text-field value=autoCloseTime}} {{text-field value=autoCloseTime}}
{{autoCloseUnits}} {{autoCloseUnits}}
</label> </label>
@ -13,7 +13,7 @@
<div> <div>
<label> <label>
{{input type="checkbox" name="autoCloseBasedOnLastPost" checked=autoCloseBasedOnLastPost}} {{input type="checkbox" name="autoCloseBasedOnLastPost" checked=autoCloseBasedOnLastPost}}
{{i18n composer.auto_close.based_on_last_post}} {{i18n 'composer.auto_close.based_on_last_post'}}
</label> </label>
</div> </div>
</div> </div>

6
app/assets/javascripts/discourse/templates/components/avatar-uploader.hbs
View file

@ -1,10 +1,10 @@
<input type="file" accept="image/*" style="display:none" /> <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}} <i class="fa fa-picture-o"></i>&nbsp;{{uploadButtonText}}
</button> </button>
{{#if uploading}} {{#if uploading}}
<span>{{i18n upload_selector.uploading}} {{view.uploadProgress}}%</span> <span>{{i18n 'upload_selector.uploading'}} {{view.uploadProgress}}%</span>
{{/if}} {{/if}}
{{#if imageIsNotASquare}} {{#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}} {{/if}}

14
app/assets/javascripts/discourse/templates/components/basic-topic-list.hbs
View file

@ -3,16 +3,16 @@
<table class="topic-list"> <table class="topic-list">
<thead> <thead>
<tr> <tr>
<th class="default">{{i18n topic.title}}</th> <th class="default">{{i18n 'topic.title'}}</th>
{{#unless controller.hideCategory}} {{#unless controller.hideCategory}}
<th class="category">{{i18n category_title}}</th> <th class="category">{{i18n 'category_title'}}</th>
{{/unless}} {{/unless}}
<th class="num posts">{{i18n posts}}</th> <th class="num posts">{{i18n 'posts'}}</th>
{{#if controller.showParticipants}} {{#if controller.showParticipants}}
<th class="posters">{{i18n users}}</th> <th class="posters">{{i18n 'users'}}</th>
{{/if}} {{/if}}
<th class="num views">{{i18n views}}</th> <th class="num views">{{i18n 'views'}}</th>
<th class="num activity">{{i18n activity}}</th> <th class="num activity">{{i18n 'activity'}}</th>
</tr> </tr>
</thead> </thead>
@ -52,7 +52,7 @@
</table> </table>
{{else}} {{else}}
<div class='alert alert-info'> <div class='alert alert-info'>
{{i18n choose_topic.none_found}} {{i18n 'choose_topic.none_found'}}
</div> </div>
{{/if}} {{/if}}
{{/loading-spinner}} {{/loading-spinner}}

4
app/assets/javascripts/discourse/templates/components/category-drop.hbs
View file

@ -7,7 +7,7 @@
</a> </a>
{{else}} {{else}}
{{#if noSubcategories}} {{#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}} {{else}}
<a href='#' {{action "expand"}} class='badge-category home' {{bind-attr style="badgeStyle"}}>{{allCategoriesLabel}}</a> <a href='#' {{action "expand"}} class='badge-category home' {{bind-attr style="badgeStyle"}}>{{allCategoriesLabel}}</a>
{{/if}} {{/if}}
@ -18,7 +18,7 @@
<section {{bind-attr class="expanded::hidden :category-dropdown-menu"}} class='chooser'> <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> <div class='cat'><a {{bind-attr href=allCategoriesUrl}} data-drop-close="true" class='badge-category home'>{{allCategoriesLabel}}</a></div>
{{#if subCategory}} {{#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}}
{{#if renderCategories}} {{#if renderCategories}}
{{#each categories}}<div class='cat'>{{category-link this allowUncategorized=true}}</div>{{/each}} {{#each categories}}<div class='cat'>{{category-link this allowUncategorized=true}}</div>{{/each}}

2
app/assets/javascripts/discourse/templates/components/discourse-banner.hbs
View file

@ -1,7 +1,7 @@
<div class="row"> <div class="row">
<div id="banner" {{bind-attr class="overlay"}}> <div id="banner" {{bind-attr class="overlay"}}>
<div id="banner-content"> <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}}} {{{banner.html}}}
</div> </div>
</div> </div>

2
app/assets/javascripts/discourse/templates/components/image-uploader.hbs
View file

@ -5,6 +5,6 @@
{{#if backgroundStyle}} {{#if backgroundStyle}}
<button {{action "trash"}} class="btn btn-danger pad-left no-text"><i class="fa fa-trash-o"></i></button> <button {{action "trash"}} class="btn btn-danger pad-left no-text"><i class="fa fa-trash-o"></i></button>
{{/if}} {{/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>
</div> </div>

28
app/assets/javascripts/discourse/templates/components/ip-lookup.hbs
View file

@ -1,36 +1,36 @@
{{#if ip}} {{#if ip}}
<button class="btn" {{action "lookup"}}> <button class="btn" {{action "lookup"}}>
{{fa-icon "globe"}}{{i18n admin.user.ip_lookup}} {{fa-icon "globe"}}{{i18n 'admin.user.ip_lookup'}}
</button> </button>
{{/if}} {{/if}}
{{#if show}} {{#if show}}
<div class="location-box"> <div class="location-box">
<a class="close pull-right" {{action "hide"}}>{{fa-icon "times"}}</a> <a class="close pull-right" {{action "hide"}}>{{fa-icon "times"}}</a>
<h4>{{i18n ip_lookup.title}}</h4> <h4>{{i18n 'ip_lookup.title'}}</h4>
<dl> <dl>
{{#if location}} {{#if location}}
{{#if location.hostname}} {{#if location.hostname}}
<dt>{{i18n ip_lookup.hostname}}</dt> <dt>{{i18n 'ip_lookup.hostname'}}</dt>
<dd>{{location.hostname}}</dd> <dd>{{location.hostname}}</dd>
{{/if}} {{/if}}
<dt>{{i18n ip_lookup.location}}</dt> <dt>{{i18n 'ip_lookup.location'}}</dt>
<dd> <dd>
{{#if location.loc}} {{#if location.loc}}
<a href="https://maps.google.com/maps?q={{unbound location.loc}}" target="_blank">{{location.loc}}</a><br> <a href="https://maps.google.com/maps?q={{unbound location.loc}}" target="_blank">{{location.loc}}</a><br>
{{city}} {{city}}
{{else}} {{else}}
{{i18n ip_lookup.location_not_found}} {{i18n 'ip_lookup.location_not_found'}}
{{/if}} {{/if}}
</dd> </dd>
{{#if location.org}} {{#if location.org}}
<dt>{{i18n ip_lookup.organisation}}</dt> <dt>{{i18n 'ip_lookup.organisation'}}</dt>
<dd>{{location.org}}</dd> <dd>{{location.org}}</dd>
{{/if}} {{/if}}
{{#if location.phone}} {{#if location.phone}}
<dt>{{i18n ip_lookup.phone}}</dt> <dt>{{i18n 'ip_lookup.phone'}}</dt>
<dd>{{location.phone}}</dd> <dd>{{location.phone}}</dd>
{{/if}} {{/if}}
{{else}} {{else}}
@ -38,11 +38,11 @@
{{/if}} {{/if}}
<dt> <dt>
{{i18n ip_lookup.other_accounts}} {{i18n 'ip_lookup.other_accounts'}}
<strong>{{totalOthersWithSameIP}}</strong> <strong>{{totalOthersWithSameIP}}</strong>
{{#if other_accounts.length}} {{#if other_accounts.length}}
<button class="btn btn-danger pull-right" {{action "deleteOtherAccounts"}}> <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> </button>
{{/if}} {{/if}}
</dt> </dt>
@ -52,11 +52,11 @@
<table class="table table-condensed table-hover"> <table class="table table-condensed table-hover">
<thead> <thead>
<tr> <tr>
<th>{{i18n ip_lookup.username}}</th> <th>{{i18n 'ip_lookup.username'}}</th>
<th>{{i18n ip_lookup.trust_level}}</th> <th>{{i18n 'ip_lookup.trust_level'}}</th>
<th>{{i18n ip_lookup.read_time}}</th> <th>{{i18n 'ip_lookup.read_time'}}</th>
<th>{{i18n ip_lookup.topics_entered}}</th> <th>{{i18n 'ip_lookup.topics_entered'}}</th>
<th>{{i18n ip_lookup.post_count}}</th> <th>{{i18n 'ip_lookup.post_count'}}</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>

4
app/assets/javascripts/discourse/templates/components/private-message-map.hbs
View file

@ -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'> <div class='participants clearfix'>
{{#each details.allowed_groups}} {{#each details.allowed_groups}}
<div class='user group'> <div class='user group'>
@ -21,6 +21,6 @@
</div> </div>
{{#if details.can_invite_to}} {{#if details.can_invite_to}}
<div class='controls'> <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> </div>
{{/if}} {{/if}}

4
app/assets/javascripts/discourse/templates/components/screened-ip-address-form.hbs
View file

@ -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"}} {{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}} {{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>

8
app/assets/javascripts/discourse/templates/components/toggle-deleted.hbs
View file

@ -1,7 +1,7 @@
{{#if postStream.show_deleted}} {{#if postStream.show_deleted}}
<p>{{i18n deleted_filter.disabled_description}}</p> <p>{{i18n 'deleted_filter.disabled_description'}}</p>
<button class='btn btn-danger' {{action "toggleDeleted"}}>{{i18n deleted_filter.enable}}</button> <button class='btn btn-danger' {{action "toggleDeleted"}}>{{i18n 'deleted_filter.enable'}}</button>
{{else}} {{else}}
<p>{{i18n deleted_filter.enabled_description}}</p> <p>{{i18n 'deleted_filter.enabled_description'}}</p>
<button class='btn btn-danger' {{action "toggleDeleted"}}>{{i18n deleted_filter.disable}}</button> <button class='btn btn-danger' {{action "toggleDeleted"}}>{{i18n 'deleted_filter.disable'}}</button>
{{/if}} {{/if}}

10
app/assets/javascripts/discourse/templates/components/toggle-summary.hbs
View file

@ -1,12 +1,12 @@
{{#if postStream.summary}} {{#if postStream.summary}}
<p>{{{i18n summary.enabled_description}}}</p> <p>{{{i18n 'summary.enabled_description'}}}</p>
<button class='btn btn-primary' {{action "toggleSummary"}}>{{i18n summary.disable}}</button> <button class='btn btn-primary' {{action "toggleSummary"}}>{{i18n 'summary.disable'}}</button>
{{else}} {{else}}
{{#if topic.estimatedReadingTime}} {{#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}} {{else}}
<p>{{{i18n summary.description count="topic.posts_count"}}}</p> <p>{{{i18n 'summary.description' count="topic.posts_count"}}}</p>
{{/if}} {{/if}}
<button class='btn btn-primary' {{action "toggleSummary"}}>{{i18n summary.enable}}</button> <button class='btn btn-primary' {{action "toggleSummary"}}>{{i18n 'summary.enable'}}</button>
{{/if}} {{/if}}

20
app/assets/javascripts/discourse/templates/components/topic-map.hbs
View file

@ -1,5 +1,5 @@
<nav class='buttons'> <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> <i {{bind-attr class=":fa toggleMapClass"}}></i>
</button> </button>
</nav> </nav>
@ -8,40 +8,40 @@
<ul class="clearfix"> <ul class="clearfix">
<li> <li>
<a href='{{unbound topic.url}}'> <a href='{{unbound topic.url}}'>
<h4>{{i18n created_lowercase}}</h4> <h4>{{i18n 'created_lowercase'}}</h4>
{{avatar details.created_by imageSize="tiny"}} {{avatar details.created_by imageSize="tiny"}}
{{format-date topic.created_at}} {{format-date topic.created_at}}
</a> </a>
</li> </li>
<li> <li>
<a {{bind-attr href="topic.lastPostUrl"}}> <a {{bind-attr href="topic.lastPostUrl"}}>
<h4>{{i18n last_post_lowercase}}</h4> <h4>{{i18n 'last_post_lowercase'}}</h4>
{{avatar details.last_poster imageSize="tiny"}} {{avatar details.last_poster imageSize="tiny"}}
{{format-date topic.last_posted_at}} {{format-date topic.last_posted_at}}
</a> </a>
</li> </li>
<li> <li>
{{posts-count-column topic=topic tagName="span"}} {{posts-count-column topic=topic tagName="span"}}
<h4>{{i18n posts_lowercase}}</h4> <h4>{{i18n 'posts_lowercase'}}</h4>
</li> </li>
<li class='secondary'> <li class='secondary'>
{{number topic.views class=topic.viewsHeat}} {{number topic.views class=topic.viewsHeat}}
<h4>{{i18n views_lowercase}}</h4> <h4>{{i18n 'views_lowercase'}}</h4>
</li> </li>
<li class='secondary'> <li class='secondary'>
{{number topic.participant_count}} {{number topic.participant_count}}
<h4>{{i18n users_lowercase}}</h4> <h4>{{i18n 'users_lowercase'}}</h4>
</li> </li>
{{#if topic.like_count}} {{#if topic.like_count}}
<li class='secondary'> <li class='secondary'>
{{number topic.like_count}} {{number topic.like_count}}
<h4>{{i18n likes_lowercase}}</h4> <h4>{{i18n 'likes_lowercase'}}</h4>
</li> </li>
{{/if}} {{/if}}
{{#if details.links.length}} {{#if details.links.length}}
<li class='secondary'> <li class='secondary'>
{{number details.links.length}} {{number details.links.length}}
<h4>{{i18n links_lowercase}}</h4> <h4>{{i18n 'links_lowercase'}}</h4>
</li> </li>
{{/if}} {{/if}}
{{#if showPosterAvatar}} {{#if showPosterAvatar}}
@ -68,7 +68,7 @@
{{#each infoLinks}} {{#each infoLinks}}
<tr> <tr>
<td> <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>
<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}}"> <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}} {{#if showAllLinksControls}}
<div class='link-summary'> <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> </div>
{{/if}} {{/if}}

20
app/assets/javascripts/discourse/templates/composer.hbs
View file

@ -7,7 +7,7 @@
{{render "composer-messages"}} {{render "composer-messages"}}
<div class='control'> <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}} {{#if model.viewOpen}}
<div class='control-row reply-area'> <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"}} {{text-field value=editReason tabindex="7" id="edit-reason" maxlength="255" placeholderKey="composer.edit_reason_placeholder"}}
</div> </div>
{{else}} {{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}}
{{/if}} {{/if}}
</div> </div>
@ -58,7 +58,7 @@
{{popupInputTip validation=view.categoryValidation shownAt=view.showCategoryTip}} {{popupInputTip validation=view.categoryValidation shownAt=view.showCategoryTip}}
</div> </div>
{{#if model.archetype.hasOptions}} {{#if model.archetype.hasOptions}}
<button class='btn' {{action "showOptions"}}>{{i18n topic.options}}</button> <button class='btn' {{action "showOptions"}}>{{i18n 'topic.options'}}</button>
{{/if}} {{/if}}
{{render "additional-composer-buttons" model}} {{render "additional-composer-buttons" model}}
{{/unless}} {{/unless}}
@ -79,10 +79,10 @@
<div class="composer-bottom-right"> <div class="composer-bottom-right">
<a href="#" {{action "togglePreview"}} class='toggle-preview'>{{{model.toggleText}}}</a> <a href="#" {{action "togglePreview"}} class='toggle-preview'>{{{model.toggleText}}}</a>
<div id="file-uploading" {{bind-attr class="view.isUploading::hidden"}}> <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> </div>
{{#if site.mobileView}} {{#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" /> <input type="file" id="mobile-uploader" />
{{/if}} {{/if}}
<div id='draft-status'>{{model.draftStatus}}</div> <div id='draft-status'>{{model.draftStatus}}</div>
@ -91,8 +91,8 @@
{{#if currentUser}} {{#if currentUser}}
<div class='submit-panel'> <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> <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> <a href='#' {{action "cancel"}} class='cancel' tabindex="6">{{i18n 'cancel'}}</a>
</div> </div>
{{/if}} {{/if}}
@ -102,13 +102,13 @@
<div class='span24'> <div class='span24'>
<div class='saving-text'> <div class='saving-text'>
{{#if model.createdPost}} {{#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}} {{else}}
{{i18n composer.saving}} {{i18n 'composer.saving'}}
{{/if}} {{/if}}
</div> </div>
<div class='draft-text'> <div class='draft-text'>
{{i18n composer.saved_draft}} {{i18n 'composer.saved_draft'}}
</div> </div>
</div> </div>
</div> </div>

4
app/assets/javascripts/discourse/templates/composer/similar_topics.hbs
View file

@ -1,8 +1,8 @@
<a href='#' {{action "closeMessage" this}} class='close'><i class='fa fa-times-circle'></i></a> <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'> <ul class='topics'>
{{#each similarTopics}} {{#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}} {{/each}}
</ul> </ul>

16
app/assets/javascripts/discourse/templates/discovery/categories.hbs
View file

@ -3,9 +3,9 @@
<table class='topic-list categories'> <table class='topic-list categories'>
<thead> <thead>
<tr> <tr>
<th class='category'>{{i18n categories.category}}</th> <th class='category'>{{i18n 'categories.category'}}</th>
<th class='latest'>{{i18n categories.latest}}</th> <th class='latest'>{{i18n 'categories.latest'}}</th>
<th class='stats topics'>{{i18n categories.topics}}</th> <th class='stats topics'>{{i18n 'categories.topics'}}</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@ -16,10 +16,10 @@
<div class="pull-left"> <div class="pull-left">
{{category-title-link category=this}} {{category-title-link category=this}}
{{#if unreadTopics}} {{#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}}
{{#if newTopics}} {{#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}} {{/if}}
</div> </div>
<div class="clearfix"></div> <div class="clearfix"></div>
@ -34,10 +34,10 @@
{{#each subcategories}} {{#each subcategories}}
{{category-link this showParent=true onlyStripe=true}} {{category-link this showParent=true onlyStripe=true}}
{{#if unreadTopics}} {{#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}}
{{#if newTopics}} {{#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}} {{/if}}
{{/each}} {{/each}}
</div> </div>
@ -52,7 +52,7 @@
{{#if controller.latestTopicOnly}} {{#if controller.latestTopicOnly}}
<div class='last-user-info'> <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> <a href="{{unbound lastPostUrl}}">{{format-age last_posted_at}}</a>
</div> </div>
{{else}} {{else}}

34
app/assets/javascripts/discourse/templates/discovery/topics.hbs
View file

@ -5,11 +5,11 @@
{{#if showDismissAtTop}} {{#if showDismissAtTop}}
<div class="row"> <div class="row">
{{#if showDismissRead}} {{#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_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_posts_tooltip'}}" id='dismiss-posts-top' class='btn dismiss-read' {{action "dismissRead" "posts"}}>{{i18n 'topics.bulk.dismiss_posts'}}</button>
{{/if}} {{/if}}
{{#if showResetNew}} {{#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}} {{/if}}
</div> </div>
{{/if}} {{/if}}
@ -30,7 +30,7 @@
<div class="show-more"> <div class="show-more">
<div class='alert alert-info clickable' {{action "showInserted"}}> <div class='alert alert-info clickable' {{action "showInserted"}}>
{{countI18n topic_count_ suffix=topicTrackingState.filter count=topicTrackingState.incomingCount}} {{countI18n topic_count_ suffix=topicTrackingState.filter count=topicTrackingState.incomingCount}}
{{i18n click_to_show}} {{i18n 'click_to_show'}}
</div> </div>
</div> </div>
{{/if}} {{/if}}
@ -41,25 +41,25 @@
{{#if currentUser}} {{#if currentUser}}
<th class='star'> <th class='star'>
{{#if canBulkSelect}} {{#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}} {{/if}}
</th> </th>
{{/if}} {{/if}}
{{#sortable-heading class="default"}} {{i18n topic.title}} {{/sortable-heading}} {{#sortable-heading class="default"}} {{i18n 'topic.title'}} {{/sortable-heading}}
{{#unless controller.hideCategory}} {{#unless controller.hideCategory}}
{{#sortable-heading sortBy="category" action="changeSort" order=order ascending=ascending}} {{#sortable-heading sortBy="category" action="changeSort" order=order ascending=ascending}}
{{i18n category_title}} {{i18n 'category_title'}}
{{/sortable-heading}} {{/sortable-heading}}
{{/unless}} {{/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}} {{#sortable-heading sortBy="posts" number=true action="changeSort" order=order ascending=ascending}}
{{i18n posts}} {{i18n 'posts'}}
{{/sortable-heading}} {{/sortable-heading}}
{{#sortable-heading sortBy="views" number=true action="changeSort" order=order ascending=ascending}} {{#sortable-heading sortBy="views" number=true action="changeSort" order=order ascending=ascending}}
{{i18n views}} {{i18n 'views'}}
{{/sortable-heading}} {{/sortable-heading}}
{{#sortable-heading sortBy="activity" number=true action="changeSort" order=order ascending=ascending}} {{#sortable-heading sortBy="activity" number=true action="changeSort" order=order ascending=ascending}}
{{i18n activity}} {{i18n 'activity'}}
{{/sortable-heading}} {{/sortable-heading}}
</tr> </tr>
</thead> </thead>
@ -74,11 +74,11 @@
{{loading-spinner condition=loadingMore}} {{loading-spinner condition=loadingMore}}
{{#if allLoaded}} {{#if allLoaded}}
{{#if showDismissRead}} {{#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_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_posts_tooltip'}}" id='dismiss-posts' class='btn dismiss-read' {{action "dismissRead" "posts"}}>{{i18n 'topics.bulk.dismiss_posts'}}</button>
{{/if}} {{/if}}
{{#if showResetNew}} {{#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}}
{{#if latest}} {{#if latest}}
@ -87,12 +87,12 @@
</div> </div>
<h3> <h3>
{{footerMessage}} {{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> </h3>
{{else}} {{else}}
{{#if top}} {{#if top}}
<h3> <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}} {{top-period-buttons period=period}}
</h3> </h3>
{{else}} {{else}}
@ -100,7 +100,7 @@
{{{footerEducation}}} {{{footerEducation}}}
</div> </div>
<h3> <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> </h3>
{{/if}} {{/if}}
{{/if}} {{/if}}

4
app/assets/javascripts/discourse/templates/embedded_post.hbs
View file

@ -9,10 +9,10 @@
<div class='topic-body'> <div class='topic-body'>
<div class="topic-meta-data"> <div class="topic-meta-data">
{{poster-name post=this}} {{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 class='post-info post-date'>{{age-with-tooltip created_at}}</div>
</div> </div>
{{{unbound cooked}}} {{{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>
</div> </div>

2
app/assets/javascripts/discourse/templates/exception.hbs
View file

@ -3,7 +3,7 @@
<div class="face">:(</div> <div class="face">:(</div>
<div class="reason">{{reason}}</div> <div class="reason">{{reason}}</div>
<div class="url"> <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>
<div class="desc"> <div class="desc">
{{#if networkFixed}} {{#if networkFixed}}

4
app/assets/javascripts/discourse/templates/group.hbs
View file

@ -2,12 +2,12 @@
<section class='user-navigation'> <section class='user-navigation'>
<ul class='action-list nav-stacked'> <ul class='action-list nav-stacked'>
<li {{bind-attr class="showingIndex:active"}}> <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> <span class='count'>({{counts.posts}})</span>
{{/link-to}} {{/link-to}}
</li> </li>
<li {{bind-attr class="showingMembers:active"}}> <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> <span class='count'>({{counts.members}})</span>
{{/link-to}} {{/link-to}}
</li> </li>

2
app/assets/javascripts/discourse/templates/group/members.hbs
View file

@ -1,7 +1,7 @@
{{#if model}} {{#if model}}
<table class='group-members'> <table class='group-members'>
<tr> <tr>
<th colspan="3" class="seen">{{i18n last_seen}}</th> <th colspan="3" class="seen">{{i18n 'last_seen'}}</th>
</tr> </tr>
{{#each model}} {{#each model}}
<tr> <tr>

16
app/assets/javascripts/discourse/templates/header.hbs
View file

@ -7,17 +7,17 @@
{{#unless currentUser}} {{#unless currentUser}}
{{#if showSignUpButton}} {{#if showSignUpButton}}
<button {{action "showCreateAccount"}} class='btn btn-primary btn-small sign-up-button'> <button {{action "showCreateAccount"}} class='btn btn-primary btn-small sign-up-button'>
{{i18n sign_up}} {{i18n 'sign_up'}}
</button> </button>
{{/if}} {{/if}}
<button {{action "showLogin"}} class='btn btn-primary btn-small login-button'> <button {{action "showLogin"}} class='btn btn-primary btn-small login-button'>
{{fa-icon user}} {{i18n log_in}} {{fa-icon user}} {{i18n 'log_in'}}
</button> </button>
{{/unless}} {{/unless}}
<ul class='icons clearfix' role='navigation'> <ul class='icons clearfix' role='navigation'>
{{#if currentUser}} {{#if currentUser}}
<li class='notifications'> <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"}} {{fa-icon comment label="notifications.title"}}
</a> </a>
{{#if currentUser.unread_notifications}} {{#if currentUser.unread_notifications}}
@ -38,7 +38,7 @@
class='icon expand' class='icon expand'
href='#' href='#'
data-dropdown="search-dropdown" data-dropdown="search-dropdown"
title='{{i18n search.title}}'> title='{{i18n 'search.title'}}'>
{{fa-icon search label="search.title"}} {{fa-icon search label="search.title"}}
</a> </a>
{{/if}} {{/if}}
@ -57,13 +57,13 @@
data-dropdown="site-map-dropdown" data-dropdown="site-map-dropdown"
data-render="renderSiteMap" data-render="renderSiteMap"
href="#" href="#"
title='{{i18n site_map}}' title='{{i18n 'site_map'}}'
id="site-map"> id="site-map">
{{fa-icon bars label="site_map"}} {{fa-icon bars label="site_map"}}
</a> </a>
{{/if}} {{/if}}
{{#if currentUser.site_flagged_posts_count}} {{#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}} {{/if}}
</li> </li>
{{#if currentUser}} {{#if currentUser}}
@ -72,7 +72,7 @@
data-dropdown="user-dropdown" data-dropdown="user-dropdown"
data-render="renderUserDropdown" data-render="renderUserDropdown"
href="#" href="#"
title='{{i18n user.avatar.title}}' title='{{i18n 'user.avatar.title'}}'
id="current-user"> id="current-user">
{{bound-avatar currentUser "medium"}} {{bound-avatar currentUser "medium"}}
</a> </a>
@ -115,7 +115,7 @@
{{#if topic.errorLoading}} {{#if topic.errorLoading}}
<span class="error">{{topic.errorTitle}}</span> <span class="error">{{topic.errorTitle}}</span>
{{else}} {{else}}
<span class="loading">{{i18n topic.loading}}</span> <span class="loading">{{i18n 'topic.loading'}}</span>
{{/if}} {{/if}}
{{/if}} {{/if}}
</h1> </h1>

2
app/assets/javascripts/discourse/templates/list/topic-excerpt.raw.hbs
View file

@ -2,7 +2,7 @@
<div class="topic-excerpt"> <div class="topic-excerpt">
{{{topic.excerpt}}} {{{topic.excerpt}}}
{{#if topic.excerptTruncated}} {{#if topic.excerptTruncated}}
<a href="{{topic.url}}">{{i18n read_more}}</a> <a href="{{topic.url}}">{{i18n 'read_more'}}</a>
{{/if}} {{/if}}
</div> </div>
{{/if}} {{/if}}

2
app/assets/javascripts/discourse/templates/list/user_topics_list.hbs
View file

@ -1,6 +1,6 @@
{{#if showNewPM}} {{#if showNewPM}}
<div class="clearfix"> <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> </div>
{{/if}} {{/if}}

6
app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs
View file

@ -17,10 +17,10 @@
<div class="topic-excerpt"> <div class="topic-excerpt">
{{excerpt}} {{excerpt}}
{{#if excerptTruncated}} {{#if excerptTruncated}}
{{#unless canClearPin}}<a href="{{url}}">{{i18n read_more}}</a>{{/unless}} {{#unless canClearPin}}<a href="{{url}}">{{i18n 'read_more'}}</a>{{/unless}}
{{/if}} {{/if}}
{{#if canClearPin}} {{#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}} {{/if}}
</div> </div>
{{/if}} {{/if}}
@ -51,7 +51,7 @@
</table> </table>
{{else}} {{else}}
<div class='alert alert-info'> <div class='alert alert-info'>
{{i18n choose_topic.none_found}} {{i18n 'choose_topic.none_found'}}
</div> </div>
{{/if}} {{/if}}
{{/loading-spinner}} {{/loading-spinner}}

12
app/assets/javascripts/discourse/templates/mobile/discovery/categories.hbs
View file

@ -27,10 +27,10 @@
<div class="topic-excerpt"> <div class="topic-excerpt">
{{{excerpt}}} {{{excerpt}}}
{{#if excerptTruncated}} {{#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}}
{{#if canClearPin}} {{#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}} {{/if}}
</div> </div>
{{/if}} {{/if}}
@ -55,12 +55,12 @@
</table> </table>
<footer class="clearfix"> <footer class="clearfix">
<figure title="{{i18n year_desc}}">{{number topics_year}} <figcaption>{{i18n category.this_year}}</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 '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 'week_desc'}}">{{number topics_week}} <figcaption>{{i18n 'week'}}</figcaption></figure>
{{#if controller.canEdit}} {{#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}} {{/if}}
</footer> </footer>

14
app/assets/javascripts/discourse/templates/mobile/discovery/topics.hbs
View file

@ -12,7 +12,7 @@
<td> <td>
<div class='alert alert-info' {{action "showInserted"}}> <div class='alert alert-info' {{action "showInserted"}}>
{{countI18n topic_count_ suffix=topicTrackingState.filter count=topicTrackingState.incomingCount}} {{countI18n topic_count_ suffix=topicTrackingState.filter count=topicTrackingState.incomingCount}}
{{i18n click_to_show}} {{i18n 'click_to_show'}}
</div> </div>
</td> </td>
</tr> </tr>
@ -27,11 +27,11 @@
{{loading-spinner condition=loadingMore}} {{loading-spinner condition=loadingMore}}
{{#if allLoaded}} {{#if allLoaded}}
{{#if showDismissRead}} {{#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_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_posts_tooltip'}}" id='dismiss-posts' class='btn dismiss-read' {{action "dismissRead" "posts"}}>{{i18n 'topics.bulk.dismiss_posts'}}</button>
{{/if}} {{/if}}
{{#if showResetNew}} {{#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}}
{{#if latest}} {{#if latest}}
@ -40,12 +40,12 @@
</div> </div>
<h3> <h3>
{{footerMessage}} {{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> </h3>
{{else}} {{else}}
{{#if top}} {{#if top}}
<h3> <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/> <br/>
{{top-period-buttons period=period}} {{top-period-buttons period=period}}
</h3> </h3>
@ -54,7 +54,7 @@
{{{footerEducation}}} {{{footerEducation}}}
</div> </div>
<h3> <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> </h3>
{{/if}} {{/if}}
{{/if}} {{/if}}

6
app/assets/javascripts/discourse/templates/mobile/list/topic_list_item.hbs
View file

@ -11,10 +11,10 @@
<div class="topic-excerpt"> <div class="topic-excerpt">
{{{excerpt}}} {{{excerpt}}}
{{#if excerptTruncated}} {{#if excerptTruncated}}
{{#unless canClearPin}}<a href="{{url}}">{{i18n read_more}}</a>{{/unless}} {{#unless canClearPin}}<a href="{{url}}">{{i18n 'read_more'}}</a>{{/unless}}
{{/if}} {{/if}}
{{#if canClearPin}} {{#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}} {{/if}}
</div> </div>
{{/if}} {{/if}}
@ -30,7 +30,7 @@
<div class="pull-right"> <div class="pull-right">
{{posts-count-column topic=this tagName="div" class="num posts" action="showTopicEntrance"}} {{posts-count-column topic=this tagName="div" class="num posts" action="showTopicEntrance"}}
<div class='num activity last'> <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"}} {{raw "list/activity-column" topic=this tagName="span" class="age"}}
</div> </div>
</div> </div>

10
app/assets/javascripts/discourse/templates/mobile/modal/login.hbs
View file

@ -6,7 +6,7 @@
<table> <table>
<tr> <tr>
<td> <td>
<label for='login-account-name'>{{i18n login.username}}&nbsp;</label> <label for='login-account-name'>{{i18n 'login.username'}}&nbsp;</label>
</td> </td>
<td> <td>
{{text-field value=loginName placeholderKey="login.email_placeholder" id="login-account-name" autocorrect="off" autocapitalize="off"}} {{text-field value=loginName placeholderKey="login.email_placeholder" id="login-account-name" autocorrect="off" autocapitalize="off"}}
@ -14,7 +14,7 @@
</tr> </tr>
<tr> <tr>
<td> <td>
<label for='login-account-password'>{{i18n login.password}}&nbsp;</label> <label for='login-account-password'>{{i18n 'login.password'}}&nbsp;</label>
</td> </td>
<td> <td>
{{text-field value=loginPassword type="password" id="login-account-password" maxlength="200"}} &nbsp; {{text-field value=loginPassword type="password" id="login-account-password" maxlength="200"}} &nbsp;
@ -23,7 +23,7 @@
<tr> <tr>
<td></td> <td></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> </td>
</tr> </tr>
</table> </table>
@ -35,7 +35,7 @@
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
{{#if authenticate}} {{#if authenticate}}
{{i18n login.authenticating}} {{i18n 'login.authenticating'}}
{{/if}} {{/if}}
{{#if canLoginLocal}} {{#if canLoginLocal}}
<button class='btn btn-large btn-primary' <button class='btn btn-large btn-primary'
@ -46,7 +46,7 @@
{{#if showSignupLink}} {{#if showSignupLink}}
<button class="btn btn-large" id="new-account-link" {{action "showCreateAccount"}}> <button class="btn btn-large" id="new-account-link" {{action "showCreateAccount"}}>
{{i18n create_account.title}} {{i18n 'create_account.title'}}
</button> </button>
{{/if}} {{/if}}
{{/if}} {{/if}}

2
app/assets/javascripts/discourse/templates/modal/archetype_options.hbs
View file

@ -4,5 +4,5 @@
</form> </form>
</div> </div>
<div class="modal-footer"> <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> </div>

6
app/assets/javascripts/discourse/templates/modal/auto_close.hbs
View file

@ -6,8 +6,8 @@
limited=details.auto_close_based_on_last_post }} limited=details.auto_close_based_on_last_post }}
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button class='btn btn-primary' type='submit' {{bind-attr disabled="auto_close_invalid"}}>{{i18n topic.auto_close_save}}</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> <a {{action "closeModal"}}>{{i18n 'cancel'}}</a>
<button class='btn pull-right' {{action "removeAutoClose"}}>{{i18n topic.auto_close_remove}}</button> <button class='btn pull-right' {{action "removeAutoClose"}}>{{i18n 'topic.auto_close_remove'}}</button>
</div> </div>
</form> </form>

14
app/assets/javascripts/discourse/templates/modal/avatar_selector.hbs
View file

@ -2,12 +2,12 @@
<div> <div>
<div> <div>
<input type="radio" id="system-avatar" name="avatar" value="system" {{action "useSystem"}}> <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>
<div> <div>
<input type="radio" id="gravatar" name="avatar" value="gravatar" {{action "useGravatar"}}> <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> <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> <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>
<div> <div>
<input type="radio" id="uploaded_avatar" name="avatar" value="uploaded" {{action "useUploadedAvatar"}}> <input type="radio" id="uploaded_avatar" name="avatar" value="uploaded" {{action "useUploadedAvatar"}}>
@ -16,10 +16,10 @@
{{#if view.uploadedAvatarTemplate}} {{#if view.uploadedAvatarTemplate}}
{{bound-avatar-template view.uploadedAvatarTemplate "large"}} {{bound-avatar-template view.uploadedAvatarTemplate "large"}}
{{else}} {{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}} {{/if}}
{{else}} {{else}}
{{i18n user.change_avatar.uploaded_avatar_empty}} {{i18n 'user.change_avatar.uploaded_avatar_empty'}}
{{/if}} {{/if}}
</label> </label>
{{avatar-uploader username=username {{avatar-uploader username=username
@ -30,6 +30,6 @@
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button class="btn btn-primary" {{action "saveAvatarSelection"}} {{bind-attr disabled="view.saveDisabled"}}>{{i18n save}}</button> <button class="btn btn-primary" {{action "saveAvatarSelection"}} {{bind-attr disabled="view.saveDisabled"}}>{{i18n 'save'}}</button>
<a {{action "closeModal"}}>{{i18n cancel}}</a> <a {{action "closeModal"}}>{{i18n 'cancel'}}</a>
</div> </div>

12
app/assets/javascripts/discourse/templates/modal/bulk_actions_buttons.hbs
View file

@ -1,10 +1,10 @@
<p> <p>
<button class='btn' {{action "showChangeCategory"}}>{{i18n topics.bulk.change_category}}</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 "deleteTopics"}}>{{i18n 'topics.bulk.delete'}}</button>
<button class='btn' {{action "closeTopics"}}>{{i18n topics.bulk.close_topics}}</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 "archiveTopics"}}>{{i18n 'topics.bulk.archive_topics'}}</button>
</p> </p>
<p> <p>
<button class='btn' {{action "showNotificationLevel"}}>{{i18n topics.bulk.notification_level}}</button> <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 "resetRead"}}>{{i18n 'topics.bulk.reset_read'}}</button>
</p> </p>

2
app/assets/javascripts/discourse/templates/modal/bulk_change_category.hbs
View file

@ -3,7 +3,7 @@
<p>{{category-chooser value=newCategoryId}}</p> <p>{{category-chooser value=newCategoryId}}</p>
{{#if loading}} {{#if loading}}
<div class='loading'>{{i18n loading}}</div> <div class='loading'>{{i18n 'loading'}}</div>
{{else}} {{else}}
<button class='btn' {{action "changeCategory"}}>Change Category</button> <button class='btn' {{action "changeCategory"}}>Change Category</button>
{{/if}} {{/if}}

2
app/assets/javascripts/discourse/templates/modal/bulk_notification_level.hbs
View file

@ -7,4 +7,4 @@
</div> </div>
{{/each}} {{/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>

6
app/assets/javascripts/discourse/templates/modal/change_owner.hbs
View file

@ -1,11 +1,11 @@
<div class="modal-body"> <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> <p>
{{{i18n topic.change_owner.instructions_warn}}} {{{i18n 'topic.change_owner.instructions_warn'}}}
</p> </p>
<form> <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"}} {{user-selector single=true usernames=new_user include_groups="false" placeholderKey="topic.change_owner.placeholder"}}
</form> </form>

22
app/assets/javascripts/discourse/templates/modal/create-account.hbs
View file

@ -10,7 +10,7 @@
<table> <table>
<tr class="input"> <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> <td>
{{input type="email" value=accountEmail id="new-account-email" disabled=emailValidated name="email" autofocus="autofocus"}} {{input type="email" value=accountEmail id="new-account-email" disabled=emailValidated name="email" autofocus="autofocus"}}
&nbsp;{{input-tip validation=emailValidation}} &nbsp;{{input-tip validation=emailValidation}}
@ -18,11 +18,11 @@
</tr> </tr>
<tr class="instructions"> <tr class="instructions">
<td></td> <td></td>
<td><label>{{i18n user.email.instructions}}</label></td> <td><label>{{i18n 'user.email.instructions'}}</label></td>
</tr> </tr>
<tr class="input"> <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> <td>
{{input value=accountUsername id="new-account-username" name="username" maxlength=maxUsernameLength}} {{input value=accountUsername id="new-account-username" name="username" maxlength=maxUsernameLength}}
&nbsp;{{input-tip validation=usernameValidation id="username-validation"}} &nbsp;{{input-tip validation=usernameValidation id="username-validation"}}
@ -30,11 +30,11 @@
</tr> </tr>
<tr class="instructions"> <tr class="instructions">
<td></td> <td></td>
<td><label>{{i18n user.username.instructions}}</label></td> <td><label>{{i18n 'user.username.instructions'}}</label></td>
</tr> </tr>
<tr class="input"> <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"> <td style="width:496px">
{{text-field value=accountName id="new-account-name"}} {{text-field value=accountName id="new-account-name"}}
&nbsp;{{input-tip validation=nameValidation}} &nbsp;{{input-tip validation=nameValidation}}
@ -42,12 +42,12 @@
</tr> </tr>
<tr class="instructions"> <tr class="instructions">
<td></td> <td></td>
<td><label>{{i18n user.name.instructions}}</label></td> <td><label>{{i18n 'user.name.instructions'}}</label></td>
</tr> </tr>
{{#if passwordRequired}} {{#if passwordRequired}}
<tr class="input"> <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> <td>
{{password-field value=accountPassword type="password" id="new-account-password" capsLockOn=capsLockOn}} {{password-field value=accountPassword type="password" id="new-account-password" capsLockOn=capsLockOn}}
&nbsp;{{input-tip validation=passwordValidation}} &nbsp;{{input-tip validation=passwordValidation}}
@ -57,13 +57,13 @@
<td></td> <td></td>
<td> <td>
<label>{{passwordInstructions}}</label> <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> </td>
</tr> </tr>
{{/if}} {{/if}}
<tr class="password-confirmation"> <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> <td>
{{input type="password" value=accountPasswordConfirm id="new-account-confirmation"}} {{input type="password" value=accountPasswordConfirm id="new-account-confirmation"}}
{{input value=accountChallenge id="new-account-challenge"}} {{input value=accountChallenge id="new-account-challenge"}}
@ -87,10 +87,10 @@
{{#if showCreateForm}} {{#if showCreateForm}}
<div class="modal-footer"> <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"}} {{#loading-spinner condition=formSubmitted size="small"}}
<button class="btn btn-large" id="login-link" {{action "showLogin"}}> <button class="btn btn-large" id="login-link" {{action "showLogin"}}>
{{i18n log_in}} {{i18n 'log_in'}}
</button> </button>
{{/loading-spinner}} {{/loading-spinner}}
</div> </div>

18
app/assets/javascripts/discourse/templates/modal/edit-category-general.hbs
View file

@ -1,18 +1,18 @@
<form> <form>
<section class='field'> <section class='field'>
<label>{{i18n category.name}}</label> <label>{{i18n 'category.name'}}</label>
{{text-field value=name placeholderKey="category.name_placeholder" maxlength="50"}} {{text-field value=name placeholderKey="category.name_placeholder" maxlength="50"}}
</section> </section>
{{#if canSelectParentCategory}} {{#if canSelectParentCategory}}
<section class='field'> <section class='field'>
{{#if subCategories}} {{#if subCategories}}
<label>{{i18n categories.subcategories}}</label> <label>{{i18n 'categories.subcategories'}}</label>
{{#each subCategories}} {{#each subCategories}}
{{category-badge this}} {{category-badge this}}
{{/each}} {{/each}}
{{else}} {{else}}
<label>{{i18n category.parent}}</label> <label>{{i18n 'category.parent'}}</label>
{{category-chooser valueAttribute="id" value=parent_category_id categories=parentCategories rootNone=true}} {{category-chooser valueAttribute="id" value=parent_category_id categories=parentCategories rootNone=true}}
{{/if}} {{/if}}
</section> </section>
@ -20,33 +20,33 @@
{{#if showDescription}} {{#if showDescription}}
<section class='field'> <section class='field'>
<label>{{i18n category.description}}</label> <label>{{i18n 'category.description'}}</label>
{{#if description}} {{#if description}}
{{description}} {{description}}
{{else}} {{else}}
{{i18n category.no_description}} {{i18n 'category.no_description'}}
{{/if}} {{/if}}
{{#if topic_url}} {{#if topic_url}}
<br/> <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}} {{/if}}
</section> </section>
{{/if}} {{/if}}
<section class='field'> <section class='field'>
<label>{{i18n category.badge_colors}}</label> <label>{{i18n 'category.badge_colors'}}</label>
<div class="category-color-editor"> <div class="category-color-editor">
{{{categoryBadgePreview}}} {{{categoryBadgePreview}}}
<div class='input-prepend input-append' style="margin-top: 10px;"> <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"}} <span class='add-on'>#</span>{{text-field value=color placeholderKey="category.color_placeholder" maxlength="6"}}
{{color-picker colors=backgroundColors usedColors=usedBackgroundColors value=color}} {{color-picker colors=backgroundColors usedColors=usedBackgroundColors value=color}}
</div> </div>
<div class='input-prepend input-append'> <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"}} <span class='add-on'>#</span>{{text-field value=text_color placeholderKey="category.color_placeholder" maxlength="6"}}
{{color-picker colors=foregroundColors value=text_color}} {{color-picker colors=foregroundColors value=text_color}}
</div> </div>

4
app/assets/javascripts/discourse/templates/modal/edit-category-images.hbs
View file

@ -1,9 +1,9 @@
<section class='field'> <section class='field'>
<label>{{i18n category.logo}}</label> <label>{{i18n 'category.logo'}}</label>
{{image-uploader uploadUrl=categoryUploadUrl imageUrl=logo_url type="logo"}} {{image-uploader uploadUrl=categoryUploadUrl imageUrl=logo_url type="logo"}}
</section> </section>
<section class='field'> <section class='field'>
<label>{{i18n category.background_image}}</label> <label>{{i18n 'category.background_image'}}</label>
{{image-uploader uploadUrl=categoryUploadUrl imageUrl=background_url type="background"}} {{image-uploader uploadUrl=categoryUploadUrl imageUrl=background_url type="background"}}
</section> </section>

4
app/assets/javascripts/discourse/templates/modal/edit-category-security.hbs
View file

@ -14,8 +14,8 @@
{{#if controller.editingPermissions}} {{#if controller.editingPermissions}}
{{view Ember.Select content=availableGroups value=selectedGroup}} {{view Ember.Select content=availableGroups value=selectedGroup}}
{{view Ember.Select class="permission-selector" optionValuePath="content.id" optionLabelPath="content.description" content=availablePermissions value=selectedPermission}} {{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}} {{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}} {{/if}}
</section> </section>

16
app/assets/javascripts/discourse/templates/modal/edit-category-settings.hbs
View file

@ -8,7 +8,7 @@
<div class="allow-badges"> <div class="allow-badges">
<div> <div>
{{input type="checkbox" checked=allow_badges}} {{input type="checkbox" checked=allow_badges}}
{{i18n category.allow_badges_label}} {{i18n 'category.allow_badges_label'}}
</div> </div>
</div> </div>
</section> </section>
@ -18,28 +18,28 @@
{{#if emailInEnabled}} {{#if emailInEnabled}}
<div> <div>
<i class="fa fa-envelope-o"></i> <i class="fa fa-envelope-o"></i>
{{i18n category.email_in}} {{i18n 'category.email_in'}}
{{text-field value=email_in}} {{text-field value=email_in}}
</div> </div>
<div> <div>
<label class="checkbox-label"> <label class="checkbox-label">
{{input type="checkbox" checked=email_in_allow_strangers}} {{input type="checkbox" checked=email_in_allow_strangers}}
{{i18n category.email_in_allow_strangers}} {{i18n 'category.email_in_allow_strangers'}}
</label> </label>
</div> </div>
{{else}} {{else}}
{{i18n category.email_in_disabled}} {{i18n 'category.email_in_disabled'}}
<a href="/admin/site_settings/category/email">{{i18n category.email_in_disabled_click}}</a> <a href="/admin/site_settings/category/email">{{i18n 'category.email_in_disabled_click'}}</a>
{{/if}} {{/if}}
</div> </div>
</section> </section>
<section class='field'> <section class='field'>
{{#if showPositionInput}} {{#if showPositionInput}}
<label>{{i18n category.position}}</label> <label>{{i18n 'category.position'}}</label>
{{text-field value=position class="position-input"}} {{text-field value=position class="position-input"}}
{{else}} {{else}}
{{i18n category.position_disabled}} {{i18n 'category.position_disabled'}}
<a href="/admin/site_settings/category/basic">{{i18n category.position_disabled_click}}</a> <a href="/admin/site_settings/category/basic">{{i18n 'category.position_disabled_click'}}</a>
{{/if}} {{/if}}
</section> </section>

Some files were not shown because too many files have changed in this diff Show more