Download as
Browse Code »

Commit 833e19f209a3e738741ff2a5be02dd48e35fa0d7

Authored by Victor Costa
1 parent 6248ae0a
Exists in master and in 1 other branch dev-fixes

Added translations to fixed texts

Showing 6 changed files with 23 additions and 9 deletions   Show diff stats
src/app/components/auth/login.html
  Diff comments   View file @833e19f
1 <div class="modal-header"> 1 <div class="modal-header">
2 - <h3 class="modal-title">Login</h3> 2 + <h3 class="modal-title">{{"auth.title" | translate}}</h3>
3 </div> 3 </div>
4 <div class="modal-body"> 4 <div class="modal-body">
5 <form> 5 <form>
6 <div class="form-group"> 6 <div class="form-group">
7 - <label for="exampleInputEmail1">Login / Email address</label> 7 + <label for="exampleInputEmail1">{{"auth.form.login" | translate}}</label>
8 <input type="text" class="form-control" id="exampleInputEmail1" placeholder="Login / Email" ng-model="vm.credentials.username"> 8 <input type="text" class="form-control" id="exampleInputEmail1" placeholder="Login / Email" ng-model="vm.credentials.username">
9 </div> 9 </div>
10 <div class="form-group"> 10 <div class="form-group">
11 - <label for="exampleInputPassword1">Password</label> 11 + <label for="exampleInputPassword1">{{"auth.form.password" | translate}}</label>
12 <input type="password" class="form-control" id="exampleInputPassword1" placeholder="Password" ng-model="vm.credentials.password"> 12 <input type="password" class="form-control" id="exampleInputPassword1" placeholder="Password" ng-model="vm.credentials.password">
13 </div> 13 </div>
14 - <button type="submit" class="btn btn-default" ng-click="vm.login()">Login</button> 14 + <button type="submit" class="btn btn-default" ng-click="vm.login()">{{"auth.form.login_button" | translate}}</button>
15 </form> 15 </form>
16 </div> 16 </div>
src/app/components/navbar/navbar.html
  Diff comments   View file @833e19f
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <div class="container-fluid"> 2 <div class="container-fluid">
3 <div class="navbar-header"> 3 <div class="navbar-header">
4 <button type="button" class="navbar-toggle collapsed" ng-click="isCollapsed = !isCollapsed"> 4 <button type="button" class="navbar-toggle collapsed" ng-click="isCollapsed = !isCollapsed">
5 - <span class="sr-only">Toggle navigation</span> 5 + <span class="sr-only">{{"navbar.toggle_menu" | translate}}</span>
6 <span class="icon-bar"></span> 6 <span class="icon-bar"></span>
7 <span class="icon-bar"></span> 7 <span class="icon-bar"></span>
8 <span class="icon-bar"></span> 8 <span class="icon-bar"></span>
src/app/components/noosfero-activities/activity/new_friendship.html
  Diff comments   View file @833e19f
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
5 <timeline-heading> 5 <timeline-heading>
6 <h4 class="timeline-title"> 6 <h4 class="timeline-title">
7 <a ui-sref="main.profile.info({profile: ctrl.activity.user.identifier})"><strong ng-bind="ctrl.activity.user.name"></strong></a> 7 <a ui-sref="main.profile.info({profile: ctrl.activity.user.identifier})"><strong ng-bind="ctrl.activity.user.name"></strong></a>
8 - <span> has made <span ng-bind="ctrl.activity.params.friend_name.length"></span> new friend(s): </span> 8 + <span> {{"activities.new_friendship.description" | translate:{friends: ctrl.activity.params.friend_name.length} }} </span>
9 <span class="comma-separated"> 9 <span class="comma-separated">
10 <a class="separated-item" ui-sref="main.profile.info({profile: ctrl.activity.params.friend_url[$index].profile})" ng-repeat="friend in ctrl.activity.params.friend_name"> 10 <a class="separated-item" ui-sref="main.profile.info({profile: ctrl.activity.params.friend_url[$index].profile})" ng-repeat="friend in ctrl.activity.params.friend_name">
11 <strong ng-bind="friend"></strong> 11 <strong ng-bind="friend"></strong>
src/app/content-viewer/navbar-actions.html
  Diff comments   View file @833e19f
1 <ul class="nav navbar-nav"> 1 <ul class="nav navbar-nav">
2 <li ng-show="vm.profile"> 2 <li ng-show="vm.profile">
3 <a href="#" role="button" ui-sref="main.profile.cms({profile: vm.profile.identifier})"> 3 <a href="#" role="button" ui-sref="main.profile.cms({profile: vm.profile.identifier})">
4 - <i class="fa fa-file fa-fw fa-lg"></i> New Post 4 + <i class="fa fa-file fa-fw fa-lg"></i> {{"navbar.content_viewer_actions.new_post" | translate}}
5 </a> 5 </a>
6 </li> 6 </li>
7 </ul> 7 </ul>
src/languages/en.json
  Diff comments   View file @833e19f
@@ -5,10 +5,17 @@ @@ -5,10 +5,17 @@
5 "navbar.settings": "Settings", 5 "navbar.settings": "Settings",
6 "navbar.logout": "Log Out", 6 "navbar.logout": "Log Out",
7 "navbar.login": "Login", 7 "navbar.login": "Login",
  8 + "navbar.toggle_menu": "Toggle navigation",
8 "language.en": "English", 9 "language.en": "English",
9 "language.pt": "Portuguese", 10 "language.pt": "Portuguese",
10 "language.selector": "Language", 11 "language.selector": "Language",
11 "profile.wall": "Profile Wall", 12 "profile.wall": "Profile Wall",
12 "activities.create_article.description": "has published on", 13 "activities.create_article.description": "has published on",
13 - "activities.add_member_in_community.description": "has joined the community" 14 + "activities.add_member_in_community.description": "has joined the community",
  15 + "activities.new_friendship.description": "has made {{friends}} new friend(s):",
  16 + "auth.title": "Login",
  17 + "auth.form.login": "Login / Email address",
  18 + "auth.form.password": "Password",
  19 + "auth.form.login_button": "Login",
  20 + "navbar.content_viewer_actions.new_post": "New Post"
14 } 21 }
src/languages/pt.json
  Diff comments   View file @833e19f
@@ -5,10 +5,17 @@ @@ -5,10 +5,17 @@
5 "navbar.settings": "Configurações", 5 "navbar.settings": "Configurações",
6 "navbar.logout": "Sair", 6 "navbar.logout": "Sair",
7 "navbar.login": "Login", 7 "navbar.login": "Login",
  8 + "navbar.toggle_menu": "Abrir Menu",
8 "language.en": "Inglês", 9 "language.en": "Inglês",
9 "language.pt": "Português", 10 "language.pt": "Português",
10 "language.selector": "Idioma", 11 "language.selector": "Idioma",
11 "profile.wall": "Mural do Perfil", 12 "profile.wall": "Mural do Perfil",
12 "activities.create_article.description": "publicou em", 13 "activities.create_article.description": "publicou em",
13 - "activities.add_member_in_community.description": "entrou na comunidade" 14 + "activities.add_member_in_community.description": "entrou na comunidade",
  15 + "activities.new_friendship.description": "fez {{friends}} novo(s) amigo(s):",
  16 + "auth.title": "Login",
  17 + "auth.form.login": "Login / Email",
  18 + "auth.form.password": "Senha",
  19 + "auth.form.login_button": "Login",
  20 + "navbar.content_viewer_actions.new_post": "Novo Artigo"
14 } 21 }