Skip to content

Commit dbc42a7

Browse files
committed
renaming i18n helper from "i18n" to "_"
1 parent 8df90be commit dbc42a7

34 files changed

+142
-142
lines changed
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<template name="comment_deleted">
22
<div class="grid-small grid-block">
3-
<p>{{i18n "your_comment_has_been_deleted"}}</p>
3+
<p>{{_ "your_comment_has_been_deleted"}}</p>
44
</div>
55
</template>

client/views/comments/comment_edit.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
{{#with comment}}
44
<form class="grid-block form-horizontal">
55
<div class="control-group">
6-
<label class="control-label">{{i18n "comment_"}}</label>
6+
<label class="control-label">{{_ "comment_"}}</label>
77
<div class="controls comment-field" id="editor"><textarea id="body" value="" class="input-xlarge">{{body}}</textarea></div>
88
</div>
99
<div class="form-actions">
10-
<a class="delete-link" href="/comments/deleted">{{i18n "delete_comment"}}</a>
11-
<input type="submit" class="button" value="{{i18n "submit"}}" title="(⌘+enter)" />
10+
<a class="delete-link" href="/comments/deleted">{{_ "delete_comment"}}</a>
11+
<input type="submit" class="button" value="{{_ "submit"}}" title="(⌘+enter)" />
1212
</div>
1313
</form>
1414
{{/with}}

client/views/comments/comment_form.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<textarea id="comment" rows="3" autofocus="autofocus"></textarea>
77
</div>
88
<div class="comment-submit">
9-
<input type="submit" class="button" value="{{i18n "add_comment"}}" title="(⌘+enter)" />
9+
<input type="submit" class="button" value="{{_ "add_comment"}}" title="(⌘+enter)" />
1010
</div>
1111
</form>
1212
</div>

client/views/comments/comment_item.html

+5-5
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
<div class="comment-actions {{#if upvoted}}upvoted{{else}}not-upvoted{{/if}} {{#if downvoted}}downvoted{{else}}not-downvoted{{/if}}">
99
<a class="upvote" href="#">
1010
<i class="icon-up"></i>
11-
<span>{{i18n "upvote"}}</span>
11+
<span>{{_ "upvote"}}</span>
1212
</a>
1313
<a class="downvote" href="#">
1414
<i class="icon-down"></i>
15-
<span>{{i18n "downvote"}}</span>
15+
<span>{{_ "downvote"}}</span>
1616
</a>
1717
</div>
1818
<div class="user-avatar">{{> avatar userId=userId shape="circle"}}</div>
@@ -21,17 +21,17 @@
2121
<a class="comment-username" href="{{profileUrl}}">{{authorName}}</a>
2222
<span class="comment-time">{{timeAgo ago}},</span>
2323
<span class="points">{{upvotes}}</span> <span class="unit">points </span>
24-
<a href="/comments/{{_id}}" class="comment-permalink icon-link goto-comment">{{i18n "link"}}</a>
24+
<a href="/comments/{{_id}}" class="comment-permalink icon-link goto-comment">{{_ "link"}}</a>
2525
{{#if can_edit}}
26-
| <a class="edit-link" href="/comments/{{_id}}/edit">{{i18n "edit"}}</a>
26+
| <a class="edit-link" href="/comments/{{_id}}/edit">{{_ "edit"}}</a>
2727
{{/if}}
2828
{{#if isAdmin}}
2929
| <span>{{full_date}}</span>
3030
{{/if}}
3131
</div>
3232
<div class="comment-text markdown">{{{htmlBody}}}</div>
3333
{{#if getSetting "nestedComments" true}}
34-
<a href="/comments/{{_id}}" class="comment-reply goto-comment">{{i18n "reply"}}</a>
34+
<a href="/comments/{{_id}}" class="comment-reply goto-comment">{{_ "reply"}}</a>
3535
{{/if}}
3636
</div>
3737
</div>
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<template name="already_logged_in">
22
<div class="grid-small grid-block dialog">
3-
<p>{{i18n "you_are_already_logged_in"}}</p>
3+
<p>{{_ "you_are_already_logged_in"}}</p>
44
</div>
55
</template>

client/views/errors/no_account.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<template name="no_account">
22
<div class="grid-small grid-block dialog">
3-
<p>{{i18n "sorry_this_is_a_private_site_please_sign_up_first"}}</p>
3+
<p>{{_ "sorry_this_is_a_private_site_please_sign_up_first"}}</p>
44
{{landingPageText}}
55
<div class="twitter-signup twitter-auth">
6-
<a class="twitter-button button" href="#">{{i18n "sign_in_sign_up_with_twitter"}}</a>
6+
<a class="twitter-button button" href="#">{{_ "sign_in_sign_up_with_twitter"}}</a>
77
</div>
88
</div>
99
</template>

client/views/errors/no_invite.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<template name="no_invite">
22
<div class="grid-small grid-block dialog">
3-
<h2>{{i18n "thanks_for_signing_up"}}</h2>
3+
<h2>{{_ "thanks_for_signing_up"}}</h2>
44
{{afterSignupText}}
5-
<p>{{i18n "the_site_is_currently_invite_only_but_we_will_let_you_know_as_soon_as_a_spot_opens_up"}}</p>
5+
<p>{{_ "the_site_is_currently_invite_only_but_we_will_let_you_know_as_soon_as_a_spot_opens_up"}}</p>
66
</div>
77
</template>

client/views/errors/no_rights.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<template name="no_rights">
22
<div class="grid-small grid-block dialog">
3-
{{i18n "sorry_you_dont_have_the_rights_to_view_this_page"}}
3+
{{_ "sorry_you_dont_have_the_rights_to_view_this_page"}}
44
</div>
55
</template>

client/views/errors/not_found.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<template name="notFound">
22
<div class="grid-small grid-block dialog">
3-
<h2>{{i18n "not_found"}}</h2>
4-
<p>{{i18n "were_sorry_whatever_you_were_looking_for_isnt_here"}}</p>
3+
<h2>{{_ "not_found"}}</h2>
4+
<p>{{_ "were_sorry_whatever_you_were_looking_for_isnt_here"}}</p>
55
</div>
66
</template>

client/views/nav/admin_menu.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<template name="adminMenu">
22
{{#if isAdmin}}
33
<div class="dropdown header-submodule admin-menu">
4-
<a class="admin dropdown-top-level" href="/">{{i18n "admin"}}</a>
4+
<a class="admin dropdown-top-level" href="/">{{_ "admin"}}</a>
55
<div class="dropdown-menu">
66
<ul role="menu" aria-labelledby="dLabel">
77
{{#each menu}}

client/views/nav/menu_item.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
<template name="menuItem">
2-
<li><a class="dropdown-sub-level" href="{{pathFor route}}">{{i18n label}}</a></li>
2+
<li><a class="dropdown-sub-level" href="{{pathFor route}}">{{_ label}}</a></li>
33
</template>

client/views/nav/submit_button.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<template name="submitButton">
22
{{#if canPost}}
3-
<a id="submit" class="submit button header-submodule" href="/submit">{{i18n "post"}}</a>
3+
<a id="submit" class="submit button header-submodule" href="/submit">{{_ "post"}}</a>
44
{{/if}}
55
</template>

client/views/nav/user_menu.html

+5-5
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
<a class="view dropdown-top-level" href="/">{{name}}</a>
55
<div class="dropdown-menu">
66
<ul role="menu" aria-labelledby="dLabel">
7-
<li><a href="{{profileUrl}}">{{i18n "profile"}}</a></li>
8-
<li><a href="/account">{{i18n "edit_account"}}</a></li>
9-
<li><a href="/sign-out">{{i18n "sign_out"}}</a></li>
7+
<li><a href="{{profileUrl}}">{{_ "profile"}}</a></li>
8+
<li><a href="/account">{{_ "edit_account"}}</a></li>
9+
<li><a href="/sign-out">{{_ "sign_out"}}</a></li>
1010
</ul>
1111
</div>
1212
</div>
1313
{{else}}
14-
<a class="account-link sign-in" href="/sign-in">{{i18n "sign_in"}}</a>
15-
<a class="account-link sign-up" href="/sign-up">{{i18n "sign_up"}}</a>
14+
<a class="account-link sign-in" href="/sign-in">{{_ "sign_in"}}</a>
15+
<a class="account-link sign-up" href="/sign-up">{{_ "sign_up"}}</a>
1616
{{/if}}
1717
</template>

client/views/nav/views_menu.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<template name="viewsMenu">
22
{{#if canView}}
33
<div class="dropdown header-submodule views-menu">
4-
<a class="view dropdown-top-level" href="/">{{i18n "view"}}</a>
4+
<a class="view dropdown-top-level" href="/">{{_ "view"}}</a>
55
<div class="dropdown-menu">
66
<ul role="menu" aria-labelledby="dLabel">
77
{{#each views}}

client/views/posts/modules/post_admin.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
{{#if postsMustBeApproved}}
55
|
66
{{#if isApproved}}
7-
<a href="#" class="unapprove-link goto-edit">{{i18n "unapprove"}}</a>
7+
<a href="#" class="unapprove-link goto-edit">{{_ "unapprove"}}</a>
88
{{else}}
9-
<a href="#" class="approve-link goto-edit">{{i18n "approve"}}</a>
9+
<a href="#" class="approve-link goto-edit">{{_ "approve"}}</a>
1010
{{/if}}
1111
{{/if}}
12-
| {{i18n "score"}}: {{shortScore}}, {{i18n "clicks"}}: {{clickCount}}, {{i18n "views"}}: {{viewCount}}
12+
| {{_ "score"}}: {{shortScore}}, {{_ "clicks"}}: {{clickCount}}, {{_ "views"}}: {{viewCount}}
1313
</div>
1414
{{/if}}
1515
</template>

client/views/posts/modules/post_comments_link.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<div class="post-meta-item">
33
<a class="comments-link" href="/posts/{{_id}}">
44
<span class="count">{{commentCount}}</span>
5-
<span class="action">{{i18n 'comments_'}}</span>
5+
<span class="action">{{_ 'comments_'}}</span>
66
</a>
77
</div>
88
</template>

client/views/posts/modules/post_discuss.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
<a class="discuss-link go-to-comments" href="/posts/{{_id}}">
33
<i class="icon-comment"></i>
44
<span class="count">{{commentCount}}</span>
5-
<span class="action">{{i18n 'discuss'}}</span>
5+
<span class="action">{{_ 'discuss'}}</span>
66
</a>
77
</template>

client/views/posts/modules/post_info.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<div class="post-meta-item">
33
<span class="points">{{baseScore}} <span class="unit">{{pointsUnitDisplayText}} </span></span>by <a class="post-author" href="{{profileUrl}}">{{authorName}}</a> <span class="post-time">{{timeAgo ago}}</span>
44
{{#if can_edit}}
5-
| <a href="/posts/{{_id}}/edit" class="edit-link goto-edit">{{i18n "edit"}}</a>
5+
| <a href="/posts/{{_id}}/edit" class="edit-link goto-edit">{{_ "edit"}}</a>
66
{{/if}}
77
</div>
88
</template>
+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<template name="postUpvote">
22
<div class="post-rank"><span>{{oneBasedRank}}</span></div>
33
{{#if upvoted}}
4-
<span class="upvote-link voted"><i class="icon-check"></i><span>{{i18n "upvoted"}}</span></span>
4+
<span class="upvote-link voted"><i class="icon-check"></i><span>{{_ "upvoted"}}</span></span>
55
{{else}}
6-
<a class="upvote-link not-voted" href="#"><i class="icon-up"></i><span>{{i18n "upvote_"}}</span></a>
6+
<a class="upvote-link not-voted" href="#"><i class="icon-up"></i><span>{{_ "upvote_"}}</span></a>
77
{{/if}}
88
</template>

client/views/posts/post_deleted.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<template name="post_deleted">
22
<div class="grid-small grid-block">
3-
<p>{{i18n "your_post_has_been_deleted"}}</p>
3+
<p>{{_ "your_post_has_been_deleted"}}</p>
44
</div>
55
</template>

client/views/posts/post_edit.html

+17-17
Original file line numberDiff line numberDiff line change
@@ -3,30 +3,30 @@
33
{{#with post}}
44
<form class="grid-block form-horizontal">
55
<div class="control-group">
6-
<label class="control-label post-form-headline">{{i18n "created"}}</label>
6+
<label class="control-label post-form-headline">{{_ "created"}}</label>
77
<div class="controls"><p>{{created}}</p></div>
88
</div>
99
<div class="control-group">
10-
<label class="control-label post-form-headline">{{i18n "title"}}</label>
10+
<label class="control-label post-form-headline">{{_ "title"}}</label>
1111
<div class="controls"><input id="title" type="text" value="{{title}}" /></div>
1212
</div>
1313
<div class="control-group">
14-
<label class="control-label post-form-url">{{i18n "url"}}</label>
14+
<label class="control-label post-form-url">{{_ "url"}}</label>
1515
<div class="controls"><input id="url" type="text" value="{{url}}" /></div>
1616
</div>
1717
{{#if shorten}}
1818
<div class="control-group">
19-
<label class="control-label post-form-url">{{i18n "short_url"}}</label>
19+
<label class="control-label post-form-url">{{_ "short_url"}}</label>
2020
<div class="controls"><input id="short-url" type="text" value="{{shortUrl}}" /></div>
2121
</div>
2222
{{/if}}
2323
<div class="control-group">
24-
<label class="control-label post-form-body">{{i18n "body"}}</label>
24+
<label class="control-label post-form-body">{{_ "body"}}</label>
2525
<div class="controls" id="editor"><textarea id="body" value="" class="input-xlarge">{{body}}</textarea></div>
2626
</div>
2727
{{#if categoriesEnabled}}
2828
<div class="control-group post-form-category">
29-
<label class="control-label">{{i18n "categories"}}</label>
29+
<label class="control-label">{{_ "categories"}}</label>
3030
<div class="controls">
3131
{{#each categories}}
3232
<label class="radio inline">
@@ -38,19 +38,19 @@
3838
{{/if}}
3939
{{#if isAdmin}}
4040
<div class="control-group post-form-sticky">
41-
<label class="control-label">{{i18n "inactive_"}}</label>
41+
<label class="control-label">{{_ "inactive_"}}</label>
4242
<div class="controls">
4343
{{inactive}}
4444
</div>
4545
</div>
4646
<div class="control-group post-form-sticky">
47-
<label class="control-label">{{i18n "sticky_"}}</label>
47+
<label class="control-label">{{_ "sticky_"}}</label>
4848
<div class="controls">
4949
<input type="checkbox" name="sticky" id="sticky" {{isSticky}} />
5050
</div>
5151
</div>
5252
<div class="control-group post-form-user">
53-
<label class="control-label">{{i18n "user"}}</label>
53+
<label class="control-label">{{_ "user"}}</label>
5454
<div class="controls">
5555
<select id="postUser">
5656
{{#each users}}
@@ -60,33 +60,33 @@
6060
</div>
6161
</div>
6262
<div class="control-group post-form-status">
63-
<label class="control-label">{{i18n "status_"}}</label>
63+
<label class="control-label">{{_ "status_"}}</label>
6464
<div class="controls">
6565
<label class="radio inline">
66-
<input id="status_pending" type="radio" value="1" name="status" {{hasStatusPending}} /> {{i18n "pending"}}
66+
<input id="status_pending" type="radio" value="1" name="status" {{hasStatusPending}} /> {{_ "pending"}}
6767
</label>
6868
<label class="radio inline">
69-
<input id="status_approved" type="radio" value="2" name="status" {{hasStatusApproved}} /> {{i18n "approved"}}
69+
<input id="status_approved" type="radio" value="2" name="status" {{hasStatusApproved}} /> {{_ "approved"}}
7070
</label>
7171
<label class="radio inline">
72-
<input id="status_rejected" type="radio" value="3" name="status" {{hasStatusRejected}} /> {{i18n "rejected"}}
72+
<input id="status_rejected" type="radio" value="3" name="status" {{hasStatusRejected}} /> {{_ "rejected"}}
7373
</label>
7474
</div>
7575
</div>
7676
<div id="postedAt" class={{showPostedAt}}>
7777
<div class="control-group">
78-
<label class="control-label post-form-date">{{i18n "posted_date"}}</label>
78+
<label class="control-label post-form-date">{{_ "posted_date"}}</label>
7979
<div class="controls"><input id="postedAtDate" type="text" value="{{postedAtDate}}" /></div>
8080
</div>
8181
<div class="control-group">
82-
<label class="control-label post-form-time">{{i18n "posted_time"}}</label>
82+
<label class="control-label post-form-time">{{_ "posted_time"}}</label>
8383
<div class="controls"><input id="postedAtTime" type="text" value="{{postedAtTime}}" /></div>
8484
</div>
8585
</div>
8686
{{/if}}
8787
<div class="form-actions">
88-
<a class="delete-link" href="/posts/deleted">{{i18n "delete_post"}}</a>
89-
<input type="submit" class="button" value="{{i18n "submit"}}" />
88+
<a class="delete-link" href="/posts/deleted">{{_ "delete_post"}}</a>
89+
<input type="submit" class="button" value="{{_ "submit"}}" />
9090
</div>
9191
</form>
9292
{{/with}}

0 commit comments

Comments
 (0)