Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixed wrong use if @T() helped.

Browse source
This commit is contained in:
Martin Edenhofer 2015-04-12 19:16:16 +02:00
parent 4981b5af05
commit 936f2f3648
6 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/javascripts/app/lib/app_post/i18n.js.coffee
View file

@ -135,7 +135,7 @@ class _i18nSingleton extends Spine.Module
translateContent: ( string, args... ) => translateContent: ( string, args... ) =>
translated = App.Utils.htmlEscape( @translate( string, args... ) ) translated = App.Utils.htmlEscape( @translate( string, args... ) )
# replace = '<span class="translation" contenteditable="true" data-text="' + App.Utils.htmlEscape(string) + '">' + translated + '<span class="icon-edit"></span>' # replace = '<span class="translation" contenteditable="true" data-text="' + App.Utils.htmlEscape(string) + '">' + translated + '<span class="icon-edit"></span>'
if App.Config.get( 'Translation' ) if App.Config.get( 'translation_inline' )
replace = '<span class="translation" contenteditable="true" data-text="' + App.Utils.htmlEscape(string) + '">' + translated + '' replace = '<span class="translation" contenteditable="true" data-text="' + App.Utils.htmlEscape(string) + '">' + translated + ''
# if !@_translated # if !@_translated
# replace += '<span class="missing">XX</span>' # replace += '<span class="missing">XX</span>'
@ -164,6 +164,8 @@ class _i18nSingleton extends Spine.Module
else else
@_translated = false @_translated = false
translated = string translated = string
if App.Config.get('developer_mode')
@log 'notice', "translation for '#{string}' in '#{@locale}' is missing"
# search %s # search %s
for arg in args for arg in args

4
app/assets/javascripts/app/views/generic/date.jst.eco
View file

@ -8,7 +8,7 @@
<div> <div>
<a class="js-today"><%- @T('today') %></a> <a class="js-today"><%- @T('today') %></a>
| |
<a class="js-minus-day"><%- @T('-1') %></a> <a class="js-plus-day"><%- @T('+1') %></a> <%- @T('day') %> <a class="js-minus-day">-1</a> <a class="js-plus-day">+1</a> <%- @T('day') %>
| |
<a class="js-minus-week"><%- @T('-7') %></a> <a class="js-plus-week"><%- @T('+7') %></a> <%- @T('days') %> <a class="js-minus-week">-7</a> <a class="js-plus-week">+7</a> <%- @T('days') %>
</div> </div>

6
app/assets/javascripts/app/views/generic/datetime.jst.eco
View file

@ -11,9 +11,9 @@
<div> <div>
<a class="js-today"><%- @T('now') %></a> <a class="js-today"><%- @T('now') %></a>
| |
<a class="js-minus-hour"><%- @T('-1') %></a> <a class="js-plus-hour"><%- @T('+1') %></a> <%- @T('hour') %> <a class="js-minus-hour">-1</a> <a class="js-plus-hour">+1</a> <%- @T('hour') %>
| |
<a class="js-minus-day"><%- @T('-1') %></a> <a class="js-plus-day"><%- @T('+1') %></a> <%- @T('day') %> <a class="js-minus-day">-1</a> <a class="js-plus-day">+1</a> <%- @T('day') %>
| |
<a class="js-minus-week"><%- @T('-7') %></a> <a class="js-plus-week"><%- @T('+7') %></a> <%- @T('days') %> <a class="js-minus-week">-7</a> <a class="js-plus-week">+7</a> <%- @T('days') %>
</div> </div>