codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2025-04-27 06:23:41 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed multiplexed-by-code-and-spoken-language component documentation i18n.

Browse source
This commit is contained in:
Nick Winter 2014-11-23 10:21:58 -08:00
parent 994584f13a
commit b359c25c97
3 changed files with 18 additions and 10 deletions

6
app/styles/game-menu/game-menu-modal.sass
View file

@ -84,3 +84,9 @@
height: 514px
padding: 50px
overflow-y: scroll
::-webkit-scrollbar
// So that the scrollbar doesn't go on top of the close button.
// Wish we could easily do this for Firefox.
display: none

19
app/views/i18n/I18NEditComponentView.coffee
View file

@ -7,17 +7,17 @@ module.exports = class I18NEditComponentView extends I18NEditModelView
buildTranslationList: ->
lang = @selectedLanguage
propDocs = @model.get('propertyDocumentation')
for propDoc, propDocIndex in propDocs
#- Component property descriptions
if i18n = propDoc.i18n
path = ["propertyDocumentation", propDocIndex]
if _.isObject propDoc.description
for progLang, description of propDoc
@wrapRow "#{propDoc.name} description (#{progLang})", [progLang, 'description'], description, i18n[lang]?[progLang]?.description, path, 'markdown'
for progLang, description of propDoc.description
@wrapRow "#{propDoc.name} description (#{progLang})", ['description', progLang], description, i18n[lang]?[progLang]?.description, path, 'markdown'
else if _.isString propDoc.description
@wrapRow "#{propDoc.name} description", ['description'], propDoc.description, i18n[lang]?.description, path, 'markdown'
if context = propDoc.context
@ -29,8 +29,8 @@ module.exports = class I18NEditComponentView extends I18NEditModelView
path = ["propertyDocumentation", propDocIndex, "returns"]
d = propDoc.returns.description
if _.isObject d
for progLang, description of d
@wrapRow "#{propDoc.name} return val (#{progLang})", [progLang, 'description'], description, i18n[lang]?[progLang]?.description, path, 'markdown'
for progLang, description of d.description
@wrapRow "#{propDoc.name} return val (#{progLang})", ['description', progLang], description, i18n[lang]?[progLang]?.description, path, 'markdown'
else if _.isString d
@wrapRow "#{propDoc.name} return val", ['description'], d, i18n[lang]?.description, path, 'markdown'
@ -40,8 +40,7 @@ module.exports = class I18NEditComponentView extends I18NEditModelView
if i18n = argDoc.i18n
path = ["propertyDocumentation", propDocIndex, 'args', argIndex]
if _.isObject argDoc.description
for progLang, description of argDoc
@wrapRow "#{propDoc.name} arg description #{argDoc.name} (#{progLang})", [progLang, 'description'], description, i18n[lang]?[progLang]?.description, path, 'markdown'
for progLang, description of argDoc.description
@wrapRow "#{propDoc.name} arg description #{argDoc.name} (#{progLang})", ['description', progLang], description, i18n[lang]?[progLang]?.description, path, 'markdown'
else if _.isString argDoc.description
@wrapRow "#{propDoc.name} arg description #{argDoc.name}", ['description'], argDoc.description, i18n[lang]?.description, path, 'markdown'

3
app/views/play/level/tome/DocFormatter.coffee
View file

@ -100,6 +100,9 @@ module.exports = class DocFormatter
if val = obj[prop]
context = @doc.context
obj[prop] = val = utils.i18n obj, prop
# For multiplexed-by-both-code-and-spoken-language objects, now also get code language again.
if _.isObject val
obj[prop] = val = obj[prop]?[@options.language]
if @doc.i18n
spokenLanguage = me.get 'preferredLanguage'
while spokenLanguage