Merge branch 'i18n'

This commit is contained in:
Sven Fuchs 2012-11-22 16:43:41 +01:00
commit 9381dee142
6 changed files with 49 additions and 36 deletions

View File

@ -4,26 +4,26 @@
<ul id="navigation"> <ul id="navigation">
<li class="home"> <li class="home">
<a {{action showRoot href=true}}>Home</a> <a {{action showRoot href=true}}>{{t layouts.top.home}}</a>
</li> </li>
<li class="stats"> <li class="stats">
<a {{action showStats href=true}}>Stats</a> <a {{action showStats href=true}}>{{t layouts.top.stats}}</a>
</li> </li>
<li> <li>
<a href="http://about.travis-ci.org/blog">Blog</a> <a href="http://about.travis-ci.org/blog">{{t layouts.top.blog}}</a>
</li> </li>
<li> <li>
<a href="http://about.travis-ci.org/docs">Docs</a> <a href="http://about.travis-ci.org/docs">{{t layouts.top.docs}}</a>
</li> </li>
<li {{bindAttr class="view.classProfile"}}> <li {{bindAttr class="view.classProfile"}}>
<p class="handle"> <p class="handle">
<a class="signed-out" href="#" {{action signIn target="Travis.app"}}>{{t layouts.top.github_login}}</a> <a class="signed-out" href="#" {{action signIn target="Travis.app"}}>{{t layouts.top.github_login}}</a>
<a class="signed-in" {{action showProfile href=true}}><img {{bindAttr src="view.gravatarUrl"}}>{{view.userName}}</a> <a class="signed-in" {{action showProfile href=true}}><img {{bindAttr src="view.gravatarUrl"}}>{{view.userName}}</a>
<span class="signing-in">Signing in</span> <span class="signing-in">{{t layouts.top.signing_in}}</span>
</p> </p>
<ul> <ul>
<li> <li>
<a {{action showProfile href=true}}>Accounts</a> <a {{action showProfile href=true}}>{{t layouts.top.accounts}}</a>
</li> </li>
<li> <li>
<a href="/" {{action signOut target="Travis.app"}}>{{t layouts.top.sign_out}}</a> <a href="/" {{action signOut target="Travis.app"}}>{{t layouts.top.sign_out}}</a>

View File

@ -1,24 +1,30 @@
<img {{bindAttr src="view.gravatarUrl"}}> <img {{bindAttr src="view.gravatarUrl"}}>
<dl class="profile"> <dl class="profile">
<dt> <div>
{{t profiles.show.github}}: <dt>
</dt> {{t profiles.show.github}}:
<dd> </dt>
<a {{bindAttr href="urlGithub"}}>{{user.login}}</a> <dd>
</dd> <a {{bindAttr href="urlGithub"}}>{{user.login}}</a>
<dt> </dd>
{{t profiles.show.email}}: </div>
</dt> <div>
<dd> <dt>
{{user.email}} {{t profiles.show.email}}:
</dd> </dt>
<dt> <dd>
{{t profiles.show.token}}: {{user.email}}
</dt> </dd>
<dd> </div>
{{user.token}} <div>
</dd> <dt>
{{t profiles.show.token}}:
</dt>
<dd>
{{user.token}}
</dd>
</div>
</dl> </dl>
<form> <form>

View File

@ -0,0 +1,5 @@
I18n.missingTranslation = ->
key = arguments[arguments.length - 1]
value = key.split('.').pop()
$.titleize(value)

View File

@ -64,6 +64,10 @@ $.extend
string[0].toLowerCase() + string.substring(1).replace /([A-Z])?/g, (match, chr) -> string[0].toLowerCase() + string.substring(1).replace /([A-Z])?/g, (match, chr) ->
if chr then "_#{chr.toUpperCase()}" else '' if chr then "_#{chr.toUpperCase()}" else ''
titleize: (string) ->
$.capitalize(string).replace /_(.)?/g, (match, chr) ->
if chr then ' ' + chr.toUpperCase() else ''
camelize: (string, uppercase) -> camelize: (string, uppercase) ->
string = if uppercase == false then $.underscore(string) else $.capitalize(string) string = if uppercase == false then $.underscore(string) else $.capitalize(string)
string.replace /_(.)?/g, (match, chr) -> string.replace /_(.)?/g, (match, chr) ->

View File

@ -71,6 +71,7 @@ if window.history.state == undefined
@store = app.store @store = app.store
$ => app.initialize() $ => app.initialize()
require 'ext/i18n'
require 'travis/ajax' require 'travis/ajax'
require 'app' require 'app'

View File

@ -14,19 +14,16 @@
@include border-radius(4px) @include border-radius(4px)
background-color: $color-bg-light background-color: $color-bg-light
dl dl.profile
float: left display: table
margin: 0 0 20px 0 margin: 0 0 20px 0
div
dt display: table-row
display: block dt
clear: left display: table-cell
float: left padding-right: 20px
width: 50px dd
margin-left: 0
dd
float: left
margin-left: 0
form form
clear: left clear: left