From 500a87d44c191ec4802c6e58412786f2e582396e Mon Sep 17 00:00:00 2001
From: blavenie <benoit.lavenier@e-is.pro>
Date: Fri, 20 Oct 2017 17:54:27 +0200
Subject: [PATCH] =?UTF-8?q?[fix]=20S=C3=A9mantique=20:=20"monnaie=20libre?=
=?UTF-8?q?=20duniter"=20-=20fix=20#553?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
www/i18n/locale-en-GB.json | 4 ++--
www/i18n/locale-en.json | 4 ++--
www/i18n/locale-es-ES.json | 4 ++--
www/i18n/locale-fr-FR.json | 4 ++--
www/i18n/locale-nl-NL.json | 4 ++--
www/templates/home/home.html | 10 +++++++---
www/templates/menu.html | 2 +-
7 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/www/i18n/locale-en-GB.json b/www/i18n/locale-en-GB.json
index 14514a9a4..b16041c6b 100644
--- a/www/i18n/locale-en-GB.json
+++ b/www/i18n/locale-en-GB.json
@@ -108,8 +108,8 @@
},
"HOME": {
"TITLE": "Cesium",
- "MESSAGE": "Welcome to the Cesium Application!<br/>Watch your <a href=\"http://duniter.org\" target=\"_system\">Duniter</a> wallets in real time.",
- "MESSAGE_SHORT": "Watch your <a href=\"http://duniter.org\" target=\"_system\">Duniter</a> wallets<br/>in real time!",
+ "WELCOME": "Welcome to the Cesium Application!",
+ "MESSAGE": "Follow your {{currency|abbreviate}} wallets easily",
"BTN_CURRENCY": "Explore currency",
"BTN_ABOUT": "about",
"BTN_HELP": "Help",
diff --git a/www/i18n/locale-en.json b/www/i18n/locale-en.json
index 1554ce14b..c585e88f0 100644
--- a/www/i18n/locale-en.json
+++ b/www/i18n/locale-en.json
@@ -108,8 +108,8 @@
},
"HOME": {
"TITLE": "Cesium",
- "MESSAGE": "Welcome to the Cesium Application!<br/>Watch your <a href=\"http://duniter.org\" target=\"_system\">Duniter</a> wallets in real time.",
- "MESSAGE_SHORT": "Watch your <a href=\"http://duniter.org\" target=\"_system\">Duniter</a> wallets<br/>in real time!",
+ "WELCOME": "Welcome to the Cesium Application!",
+ "MESSAGE": "Follow your {{currency|abbreviate}} wallets easily",
"BTN_CURRENCY": "Explore currency",
"BTN_ABOUT": "about",
"BTN_HELP": "Help",
diff --git a/www/i18n/locale-es-ES.json b/www/i18n/locale-es-ES.json
index abd5f1753..92b7fd3e9 100644
--- a/www/i18n/locale-es-ES.json
+++ b/www/i18n/locale-es-ES.json
@@ -108,8 +108,8 @@
},
"HOME": {
"TITLE": "Cesium",
- "MESSAGE": "Bienvenida en la aplicación Cesium !<br/>Sigue sus cuentas <a href=\"http://duniter.org\" target=\"_system\">Duniter</a> en tiempo real.",
- "MESSAGE_SHORT": "Sigue sus cuentas <a href=\"http://duniter.org\" target=\"_system\">Duniter</a><br/>en tiempo real !",
+ "WELCOME": "Bienvenida en la aplicación Cesium !",
+ "MESSAGE": "Sigue sus cuentas de {{currency|abbreviate}} con facilidad",
"BTN_CURRENCY": "Explorar la moneda",
"BTN_ABOUT": "A propósito",
"BTN_HELP": "Ayuda en lÃnea",
diff --git a/www/i18n/locale-fr-FR.json b/www/i18n/locale-fr-FR.json
index f0e11620b..0f8116045 100644
--- a/www/i18n/locale-fr-FR.json
+++ b/www/i18n/locale-fr-FR.json
@@ -108,8 +108,8 @@
},
"HOME": {
"TITLE": "Cesium",
- "MESSAGE": "Bienvenue dans l'application Cesium !<br/>Suivez vos comptes en monnaie libre <a href=\"http://duniter.org\" target=\"_system\">Duniter</a>.",
- "MESSAGE_SHORT": "Suivez vos comptes en monnaie libre <a href=\"http://duniter.org\" target=\"_system\">Duniter</a> !",
+ "WELCOME": "Bienvenue dans l'application Cesium !",
+ "MESSAGE": "Suivez vos comptes {{currency|abbreviate}} en toute simplicité",
"BTN_CURRENCY": "Explorer la monnaie {{name|abbreviate}}",
"BTN_ABOUT": "Ã propos",
"BTN_HELP": "Aide en ligne",
diff --git a/www/i18n/locale-nl-NL.json b/www/i18n/locale-nl-NL.json
index b1392ca8f..d1d88ddac 100644
--- a/www/i18n/locale-nl-NL.json
+++ b/www/i18n/locale-nl-NL.json
@@ -106,8 +106,8 @@
},
"HOME": {
"TITLE": "Cesium",
- "MESSAGE": "Welkom bij de Cesium Applicatie!<br/>Bekijk je <a href=\"http://duniter.org\" target=\"_system\">Duniter</a> portefeilles in real time.",
- "MESSAGE_SHORT": "Bekijk je <a href=\"http://duniter.org\" target=\"_system\">Duniter</a> portefeilles<br/>in real time!",
+ "WELCOME": "Welkom bij de Cesium Applicatie!",
+ "MESSAGE": "Bekijk je {{currency|abbreviate}} portefeilles in real time.",
"BTN_REGISTRY": "Register",
"BTN_CURRENCY": "Verken valuta",
"BTN_ABOUT": "over",
diff --git a/www/templates/home/home.html b/www/templates/home/home.html
index 1b66d50aa..fcebdf5db 100644
--- a/www/templates/home/home.html
+++ b/www/templates/home/home.html
@@ -3,11 +3,15 @@
</ion-nav-title>
- <ion-content class="has-header text-center padding-xs positive-900-bg">
+ <ion-content
+ class="has-header text-center padding-xs positive-900-bg">
<div id="helptip-home-logo" class="logo"></div>
- <h4 class="hidden-xs" translate>HOME.MESSAGE</h4>
- <h4 class="visible-xs" translate>HOME.MESSAGE_SHORT</h4>
+
+ <h4>
+ <span class="hidden-xs" translate>HOME.WELCOME</span>
+ <span ng-show="!loading" translate-values=":currency:{currency: $root.currency.name}" translate>HOME.MESSAGE</span>
+ </h4>
<div class="center padding" >
diff --git a/www/templates/menu.html b/www/templates/menu.html
index 1731f5993..053cc3630 100644
--- a/www/templates/menu.html
+++ b/www/templates/menu.html
@@ -53,7 +53,7 @@
<ion-header-bar>
<h1 class="title dark hidden-sm hidden-xs" >
<span class="animate-fade-in animate-show-hide ng-hide" ng-show="$root.currency.name">
- {{:locale:'COMMON.APP_NAME'|translate}} {{$root.currency.name|currencySymbol:false }}
+ {{:locale:'COMMON.APP_NAME'|translate}} {{$root.currency.name|abbreviate}}
</span>
</h1>
--
GitLab