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

Code cleanup.

Browse source
This commit is contained in:
Martin Edenhofer 2013-06-18 22:52:20 +02:00
parent bf476d74ed
commit 68f608d9f9
1 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -7,12 +7,17 @@ class App.i18n
@translateContent: ( string, args... ) -> @translateContent: ( string, args... ) ->
if _instance == undefined if _instance == undefined
_instance ?= new _Singleton _instance ?= new _Singleton
_instance.translate_content( string, args ) _instance.translateContent( string, args )
@translatePlain: ( string, args... ) ->
if _instance == undefined
_instance ?= new _Singleton
_instance.translatePlain( string, args )
@translateInline: ( string, args... ) -> @translateInline: ( string, args... ) ->
if _instance == undefined if _instance == undefined
_instance ?= new _Singleton _instance ?= new _Singleton
_instance.translate_inline( string, args ) _instance.translateInline( string, args )
@translateTimestamp: ( args ) -> @translateTimestamp: ( args ) ->
if _instance == undefined if _instance == undefined
@ -116,11 +121,11 @@ class _Singleton extends Spine.Module
App.Translation.refresh( { id: object[0], source: object[1], target: object[2], locale: @locale } ) App.Translation.refresh( { id: object[0], source: object[1], target: object[2], locale: @locale } )
) )
translate_inline: ( string, args... ) => translateInline: ( string, args... ) =>
@translate( string, args... ) @escape( @translate( string, args... ) )
translate_content: ( string, args... ) => translateContent: ( string, args... ) =>
translated = @translate( string, args... ) translated = @escape( @translate( string, args... ) )
# replace = '<span class="translation" contenteditable="true" data-text="' + @escape(string) + '">' + translated + '<span class="icon-edit"></span>' # replace = '<span class="translation" contenteditable="true" data-text="' + @escape(string) + '">' + translated + '<span class="icon-edit"></span>'
if App.Config.get( 'Translation' ) if App.Config.get( 'Translation' )
replace = '<span class="translation" contenteditable="true" data-text="' + @escape(string) + '">' + translated + '' replace = '<span class="translation" contenteditable="true" data-text="' + @escape(string) + '">' + translated + ''
@ -130,6 +135,9 @@ class _Singleton extends Spine.Module
else else
translated translated
translatePlain: ( string, args... ) =>
@translate( string, args... )
translate: ( string, args... ) => translate: ( string, args... ) =>
# return '' on undefined # return '' on undefined
@ -147,9 +155,6 @@ class _Singleton extends Spine.Module
for arg in args for arg in args
translated = translated.replace(/%s/, arg) translated = translated.replace(/%s/, arg)
# escape
translated = @escape(translated)
@log 'i18n', 'debug', 'translate', string, args, translated @log 'i18n', 'debug', 'translate', string, args, translated
# return translated string # return translated string