Browse Source

translations updated

master
arnaucode 7 years ago
parent
commit
ff8f5ba55b
15 changed files with 58 additions and 51 deletions
  1. +21
    -1
      www/js/translations.js
  2. +6
    -19
      www/templates/editUser.html
  3. +2
    -2
      www/templates/login.html
  4. +3
    -3
      www/templates/main.html
  5. +3
    -3
      www/templates/menu.html
  6. +3
    -3
      www/templates/newTravel.html
  7. +2
    -2
      www/templates/offerCar.html
  8. +2
    -2
      www/templates/search.html
  9. +1
    -1
      www/templates/settings.html
  10. +5
    -5
      www/templates/travel.html
  11. +1
    -1
      www/templates/travels.html
  12. +5
    -5
      www/templates/user.html
  13. +1
    -1
      www/templates/userLikes.html
  14. +2
    -2
      www/templates/userTravels.html
  15. +1
    -1
      www/templates/users.html

+ 21
- 1
www/js/translations.js

@ -58,7 +58,27 @@ var translations = {
"history_of": "history of", "history_of": "history of",
"current_publications_of": "current publications of", "current_publications_of": "current publications of",
"publications": "publications", "publications": "publications",
"Edit_user": "Edit user",
"Save_changes": "Save changes",
"LOG_IN": "LOG IN",
"Not_account_yet?": "Not account yet?",
"profile": "profile",
"New_travel": "New travel",
"FAQ": "F.A.Q.",
"Home": "Home",
"Offer_Car": "Offer Car",
"Ask_for_Car": "Ask for Car",
"Ask_for_Package": "Ask for Package",
"Get_positions": "Get positions",
"version": "version",
"package": "package",
"seats": "seats",
"Pendent_petitions": "Pendent petitions",
"load_more": "Pendent petitions",
"view_likes": "view likes",
"Edit_profile": "Edit profile",
"Travels_offering": "Travels offering",
"Travels_joining": "Travels joining"
}, },
"catala": { "catala": {
"Actual_language": "Idioma actual: ", "Actual_language": "Idioma actual: ",

+ 6
- 19
www/templates/editUser.html

@ -1,4 +1,4 @@
<ion-view view-title="{{'Edit user' | translate}} {{user.username}}">
<ion-view view-title="{{'Edit_user' | translate}} {{user.username}}">
<ion-content class="has-footer"> <ion-content class="has-footer">
<div class="o_userProfileBackground"> <div class="o_userProfileBackground">
<img ng-src="{{user.avatar}}" class="o_userImgCircular" <img ng-src="{{user.avatar}}" class="o_userImgCircular"
@ -12,30 +12,17 @@
<input ng-model="user.email" class="o_transparentInput" <input ng-model="user.email" class="o_transparentInput"
placeholder="{{'Email' | translate}}"> placeholder="{{'Email' | translate}}">
</p> </p>
<p>
@<input ng-model="user.telegram" class="o_transparentInput"
placeholder="{{'Telegram' | translate}}">
</p>
<p ng-show="storageuser._id==user._id"> <p ng-show="storageuser._id==user._id">
<md-button class="o_purple300" ng-click="update()"> <md-button class="o_purple300" ng-click="update()">
Save changes
{{'Save_changes' | translate}}
</md-button> </md-button>
</p> </p>
</div> </div>
<div class="">
<div class="row">
<a class="tab-item">
<i class="icon ion-paper-airplane"></i>
@
<input style="display: inline-block;" type="text" ng-model="user.telegram" placeholder="{{'Telegram' | translate}}">
</a>
<a class="tab-item">
<i class="icon ion-android-car"></i>
{{user.travels.length}} Travels
</a>
<a class="tab-item">
<i class="icon ion-ios-heart"></i>
{{user.favs.length}} favs
</a>
</div>
</div>
<div class="item"> <div class="item">
<img src="{{user.faircoin}}" style="width: 100%;" <img src="{{user.faircoin}}" style="width: 100%;"
ng-click="selectFaircoinPublicKey()" /> ng-click="selectFaircoinPublicKey()" />

+ 2
- 2
www/templates/login.html

@ -20,14 +20,14 @@
<br> <br>
<p> <p>
<a class="o_loginButton button button-block" ng-click="doLogin()"> <a class="o_loginButton button button-block" ng-click="doLogin()">
{{'LOG IN' | translate}}
{{'LOG_IN' | translate}}
</a> </a>
</p> </p>
<br> <br>
<p> <p>
<a class="o_signupLink" ng-href="#/app/signup"> <a class="o_signupLink" ng-href="#/app/signup">
Not account yet? {{'Create one' | translate}}
{{'Not_account_yet?' | translate}} {{'Create one' | translate}}
</a> </a>
</p> </p>
<!--<p> <!--<p>

+ 3
- 3
www/templates/main.html

@ -2,11 +2,11 @@
<ion-content class="has-footer"> <ion-content class="has-footer">
<a ng-href="#/app/users/{{storageuser._id}}" class="item item-icon-left o_purpleG300to500"> <a ng-href="#/app/users/{{storageuser._id}}" class="item item-icon-left o_purpleG300to500">
<i class="icon ion-person"></i> <i class="icon ion-person"></i>
{{storageuser.username}} profile
{{storageuser.username}} {{'profile' | translate}}
</a> </a>
<a ng-href="#/app/newTravel" class="item item-icon-left o_purpleG300to500"> <a ng-href="#/app/newTravel" class="item item-icon-left o_purpleG300to500">
<i class="icon ion-map"></i> <i class="icon ion-map"></i>
New travel
{{'New_travel' | translate}}
</a> </a>
<a ng-href="#/app/search" class="item item-icon-left o_purpleG300to500"> <a ng-href="#/app/search" class="item item-icon-left o_purpleG300to500">
<i class="icon ion-search"></i> <i class="icon ion-search"></i>
@ -31,7 +31,7 @@
</a> </a>
<a href="#/app/help" class="item item-icon-left o_purpleG300to500"> <a href="#/app/help" class="item item-icon-left o_purpleG300to500">
<i class="icon ion-ios-paper-outline"></i> <i class="icon ion-ios-paper-outline"></i>
F.A.Q.
{{'FAQ' | translate }}
</a> </a>
<a href="#/app/help" class="item item-icon-left o_purpleG300to500"> <a href="#/app/help" class="item item-icon-left o_purpleG300to500">
<i class="icon ion-ios-help-outline"></i> <i class="icon ion-ios-help-outline"></i>

+ 3
- 3
www/templates/menu.html

@ -14,13 +14,13 @@
<div class="tabs tabs-icon-left" style="position:absolute;" <div class="tabs tabs-icon-left" style="position:absolute;"
ng-controller="FooterMenuCtrl" ng-show="storageuser"> ng-controller="FooterMenuCtrl" ng-show="storageuser">
<a class="tab-item" ng-href="#/app/notifications"> <a class="tab-item" ng-href="#/app/notifications">
<i class="icon ion-android-notifications-none"></i> Notifications
<i class="icon ion-android-notifications-none"></i> {{'Notifications' | translate }}
</a> </a>
<a class="tab-item" ng-href="#/app/main"> <a class="tab-item" ng-href="#/app/main">
<i class="icon ion-home"></i> Home
<i class="icon ion-home"></i> {{'Home' | translate }}
</a> </a>
<a ng-href="#/app/newTravel" class="tab-item"> <a ng-href="#/app/newTravel" class="tab-item">
<i class="icon ion-map"></i> New travel
<i class="icon ion-map"></i> {{'New_travel' | translate }}
</a> </a>
</div> </div>
<!-- /menu footer --> <!-- /menu footer -->

+ 3
- 3
www/templates/newTravel.html

@ -2,15 +2,15 @@
<ion-content class="has-footer"> <ion-content class="has-footer">
<a ng-href="#/app/offerCar" class="item item-icon-left o_purple500"> <a ng-href="#/app/offerCar" class="item item-icon-left o_purple500">
<i class="icon ion-android-car"></i> <i class="icon ion-android-car"></i>
Offer Car
{{'Offer_Car' | translate}}
</a> </a>
<a href="#/app/askCar" class="item item-icon-left o_purple400"> <a href="#/app/askCar" class="item item-icon-left o_purple400">
<i class="icon ion-help"></i> <i class="icon ion-help"></i>
Ask for Car (not yet)
{{'Ask_for_Car' | translate}} (not yet)
</a> </a>
<a href="#/app/askPackage" class="item item-icon-left o_purple300"> <a href="#/app/askPackage" class="item item-icon-left o_purple300">
<i class="icon ion-ios-box"></i> <i class="icon ion-ios-box"></i>
Ask for Package (not yet)
{{'Ask_for_Package' | translate}} (not yet)
</a> </a>
</ion-content> </ion-content>
</ion-view> </ion-view>

+ 2
- 2
www/templates/offerCar.html

@ -1,4 +1,4 @@
<ion-view view-title="Offer Car">
<ion-view view-title="{{'Offer_Car' | translate}}">
<ion-content class="has-footer"> <ion-content class="has-footer">
<div class="padding"> <div class="padding">
<md-input-container class="md-block" flex-gt-sm> <md-input-container class="md-block" flex-gt-sm>
@ -17,7 +17,7 @@
</div> </div>
</div><!-- end of padding --> </div><!-- end of padding -->
<md-button ng-click="getGeo()" ng-show="newtravel.from.name && newtravel.to.name" <md-button ng-click="getGeo()" ng-show="newtravel.from.name && newtravel.to.name"
class="o_purple300">Get positions</md-button>
class="o_purple300">{{'Get_positions' | translate}}</md-button>
<leaflet ng-show="markers[0]" <leaflet ng-show="markers[0]"
width="100%" height="40%" markers="markers" center="center" width="100%" height="40%" markers="markers" center="center"

+ 2
- 2
www/templates/search.html

@ -7,7 +7,7 @@
<md-button class="o_purple300" ng-click="doSearch()"><i class="icon ion-search"></i></md-button> <md-button class="o_purple300" ng-click="doSearch()"><i class="icon ion-search"></i></md-button>
</div> </div>
<div class="item item-divider o_purple300" ng-show="travels[0]"> <div class="item item-divider o_purple300" ng-show="travels[0]">
Travels
{{'Travels' | translate}}
</div> </div>
<a ng-repeat="travel in travels | orderBy: 'date'" <a ng-repeat="travel in travels | orderBy: 'date'"
class="item item-icon-left" href="#/app/travels/{{travel._id}}"> class="item item-icon-left" href="#/app/travels/{{travel._id}}">
@ -25,7 +25,7 @@
</p> </p>
</a> </a>
<div class="item item-divider o_purple300" ng-show="users[0]"> <div class="item item-divider o_purple300" ng-show="users[0]">
Users
{{'Users' | translate}}
</div> </div>
<a ng-repeat="user in users | orderBy: 'date'" class="item item-avatar" ng-href="#/app/users/{{user._id}}"> <a ng-repeat="user in users | orderBy: 'date'" class="item item-avatar" ng-href="#/app/users/{{user._id}}">
<img ng-src="{{user.avatar}}"> <img ng-src="{{user.avatar}}">

+ 1
- 1
www/templates/settings.html

@ -10,7 +10,7 @@
</select> </select>
</label> </label>
<p> <p>
version: CarsInCommon-v012
{{'version' | translate}}: CarsInCommon-v012
</p> </p>
</ion-content> </ion-content>
</ion-view> </ion-view>

+ 5
- 5
www/templates/travel.html

@ -28,17 +28,17 @@
tiles="tiles" id="map-simple-map"></leaflet> tiles="tiles" id="map-simple-map"></leaflet>
<div class="item item-icon-left"> <div class="item item-icon-left">
<i class="icon ion-ios-location-outline"></i>From: {{travel.from.name}}
<i class="icon ion-ios-location-outline"></i>{{'From' | translate}}: {{travel.from.name}}
</div> </div>
<div class="item item-icon-left"> <div class="item item-icon-left">
<i class="icon ion-ios-location"></i>To: {{travel.to.name}}
<i class="icon ion-ios-location"></i>{{'To' | translate}}: {{travel.to.name}}
</div> </div>
<div class="item item-icon-left"> <div class="item item-icon-left">
<i class="icon ion-clipboard"></i> {{travel.description}} <i class="icon ion-clipboard"></i> {{travel.description}}
</div> </div>
<div class="item item-icon-left" ng-show="travel.package"> <div class="item item-icon-left" ng-show="travel.package">
<i class="icon ion-ios-box"></i> package
<i class="icon ion-ios-box"></i> {{'package' | translate}}
</div> </div>
<a class="item item-icon-left" ng-show="travel.user.telegram" <a class="item item-icon-left" ng-show="travel.user.telegram"
ng-href="http://telegram.me/{{travel.user.telegram}}"> ng-href="http://telegram.me/{{travel.user.telegram}}">
@ -86,13 +86,13 @@
<!--<button class="o_floatRight button o_grey600" ng-show="travel.user._id==storageuser._id"> <!--<button class="o_floatRight button o_grey600" ng-show="travel.user._id==storageuser._id">
<i class="icon ion-edit"></i> <i class="icon ion-edit"></i>
</button>--> </button>-->
<p>{{travel.joins.length}}/{{travel.seats}} seats</p>
<p>{{travel.joins.length}}/{{travel.seats}} {{'seats' | translate}}</p>
<a ng-repeat="join in travel.joins" ng-href="#/app/users/{{join._id}}"> <a ng-repeat="join in travel.joins" ng-href="#/app/users/{{join._id}}">
<img class="o_userImgCircularMini" ng-src="{{join.avatar}}"></img> <img class="o_userImgCircularMini" ng-src="{{join.avatar}}"></img>
</a> </a>
</div> </div>
<div ng-show="travel.joinPetitions.length>0"> <div ng-show="travel.joinPetitions.length>0">
<p>Pendent petitions</p>
<p>{{'Pendent_petitions' | translate}}</p>
<div class="row" ng-repeat="joinPetition in travel.joinPetitions"> <div class="row" ng-repeat="joinPetition in travel.joinPetitions">
<div class="col col-90"> <div class="col col-90">
<a class="item item-avatar" ng-href="#/app/users/{{joinPetition._id}}"> <a class="item item-avatar" ng-href="#/app/users/{{joinPetition._id}}">

+ 1
- 1
www/templates/travels.html

@ -35,7 +35,7 @@
</a> </a>
</div> </div>
<div class="button" ng-click="paginationNext()"> <div class="button" ng-click="paginationNext()">
load more
{{'load_more' | translate}}
</div> </div>
</ion-content> </ion-content>
</ion-view> </ion-view>

+ 5
- 5
www/templates/user.html

@ -11,10 +11,10 @@
<p>{{user.email}}</p> <p>{{user.email}}</p>
<p><a class="button button-small" ng-href="#/app/users/userLikes/{{user._id}}"> <p><a class="button button-small" ng-href="#/app/users/userLikes/{{user._id}}">
view likes
{{'view_likes' | translate}}
</a></p> </a></p>
<p ng-show="storageuser._id==user._id"> <p ng-show="storageuser._id==user._id">
<md-button class="o_grey500" ng-href="#/app/editUser">Edit profile</md-button>
<md-button class="o_grey500" ng-href="#/app/editUser">{{'Edit_profile' | translate}}</md-button>
</p> </p>
</div> </div>
<div class=""> <div class="">
@ -26,18 +26,18 @@
</a> </a>
<a class="tab-item" ng-href="#/app/users/userTravels/{{user._id}}"> <a class="tab-item" ng-href="#/app/users/userTravels/{{user._id}}">
<i class="icon ion-android-car"></i> <i class="icon ion-android-car"></i>
{{user.travels.length}} Travels
{{user.travels.length}} {{'Travels' | translate}}
</a> </a>
<a class="tab-item" ng-show="arrayObjectIndexOf(user.likes, storageuser._id)==-1"> <a class="tab-item" ng-show="arrayObjectIndexOf(user.likes, storageuser._id)==-1">
<i class="icon ion-heart" ng-click="likeUser()"></i> <i class="icon ion-heart" ng-click="likeUser()"></i>
<i ng-href="#/app/users/userLikes/{{user._id}}"> <i ng-href="#/app/users/userLikes/{{user._id}}">
{{user.likes.length}} likes
{{user.likes.length}} {{'likes' | translate}}
</i> </i>
</a> </a>
<a class="tab-item" ng-show="arrayObjectIndexOf(user.likes, storageuser._id)>-1"> <a class="tab-item" ng-show="arrayObjectIndexOf(user.likes, storageuser._id)>-1">
<i class="icon ion-heart-broken" ng-click="unlikeUser()"></i> <i class="icon ion-heart-broken" ng-click="unlikeUser()"></i>
<i ng-href="#/app/users/userLikes/{{user._id}}"> <i ng-href="#/app/users/userLikes/{{user._id}}">
{{user.likes.length}} likes
{{user.likes.length}} {{'likes' | translate}}
</i> </i>
</a> </a>
</div> </div>

+ 1
- 1
www/templates/userLikes.html

@ -1,4 +1,4 @@
<ion-view view-title="{{' travels' | translate}}">
<ion-view view-title="{{' likes' | translate}}">
<ion-content class="has-footer"> <ion-content class="has-footer">
<ion-refresher <ion-refresher
pulling-text="{{'Pull_to_refresh' | translate}}..." pulling-text="{{'Pull_to_refresh' | translate}}..."

+ 2
- 2
www/templates/userTravels.html

@ -6,7 +6,7 @@
</ion-refresher> </ion-refresher>
<div class="list"> <div class="list">
<div class="item item-divider o_purple300" ng-show="travels[0]"> <div class="item item-divider o_purple300" ng-show="travels[0]">
Travels offering
{{'Travels_offering' | translate}}
</div> </div>
<a ng-repeat="travel in travels | orderBy: 'date'" <a ng-repeat="travel in travels | orderBy: 'date'"
class="item item-icon-left" href="#/app/travels/{{travel._id}}"> class="item item-icon-left" href="#/app/travels/{{travel._id}}">
@ -24,7 +24,7 @@
</p> </p>
</a> </a>
<div class="item item-divider o_purple300" ng-show="joins[0]"> <div class="item item-divider o_purple300" ng-show="joins[0]">
Travels joining
{{'Travels_joining' | translate}}
</div> </div>
<a ng-repeat="travel in joins | orderBy: 'date'" <a ng-repeat="travel in joins | orderBy: 'date'"
class="item item-icon-left" href="#/app/travels/{{travel._id}}"> class="item item-icon-left" href="#/app/travels/{{travel._id}}">

+ 1
- 1
www/templates/users.html

@ -1,7 +1,7 @@
<ion-view view-title="{{'Users' | translate}}"> <ion-view view-title="{{'Users' | translate}}">
<ion-content class="has-footer"> <ion-content class="has-footer">
<ion-refresher <ion-refresher
pulling-text="Pull to refresh..."
pulling-text="{{'Pull_to_refresh' | translate}}..."
on-refresh="doRefresh()"> on-refresh="doRefresh()">
</ion-refresher> </ion-refresher>
<div class="list"> <div class="list">

Loading…
Cancel
Save