Merge branch 'FixGenericText' of https://github.com/dpen2000/codecombat into dpen2000-FixGenericText

This commit is contained in:
Scott Erickson 2014-04-24 13:29:24 -07:00
commit 2d43b36022
3 changed files with 7 additions and 2 deletions
app
locale
templates/kinds
views/kinds

View file

@ -372,10 +372,12 @@
new_article_title: "Create a New Article"
new_thang_title: "Create a New Thang Type"
new_level_title: "Create a New Level"
new_article_title_signup: "Sign Up to Create a New Article"
new_thang_title_signup: "Sign Up to Create a New Thang Type"
new_level_title_signup: "Sign Up to Create a New Level"
article_search_title: "Search Articles Here"
thang_search_title: "Search Thang Types Here"
level_search_title: "Search Levels Here"
signup_to_create: "Sign Up to Create a New Content"
read_only_warning2: "Note: you can't save any edits here, because you're not logged in."
article:

View file

@ -9,7 +9,7 @@ block content
| #{currentEditor}
if me.get('anonymous')
a.btn.btn-primary.open-modal-button(data-toggle="coco-modal", data-target="modal/signup", role="button", data-i18n="editor.signup_to_create") Sign Up to Create a New Content
a.btn.btn-primary.open-modal-button(data-toggle="coco-modal", data-target="modal/signup", role="button", data-i18n="#{currentNewSignup}") Sign Up to Create a New Content
else
a.btn.btn-primary.open-modal-button(href='#new-model-modal', role="button", data-toggle="modal", data-i18n="#{currentNew}") Create a New Something
input#search(data-i18n="[placeholder]#{currentSearch}")

View file

@ -32,14 +32,17 @@ module.exports = class SearchView extends View
when 'Level'
context.currentEditor = 'editor.level_title'
context.currentNew = 'editor.new_level_title'
context.currentNewSignup = 'editor.new_level_title_signup'
context.currentSearch = 'editor.level_search_title'
when 'Thang Type'
context.currentEditor = 'editor.thang_title'
context.currentNew = 'editor.new_thang_title'
context.currentNewSignup = 'editor.new_thang_title_signup'
context.currentSearch = 'editor.thang_search_title'
when 'Article'
context.currentEditor = 'editor.article_title'
context.currentNew = 'editor.new_article_title'
context.currentNewSignup = 'editor.new_article_title_signup'
context.currentSearch = 'editor.article_search_title'
@$el.i18n()
context