From 7c48bbe17251fef1d3045ac8b5b6fe8058b4fb10 Mon Sep 17 00:00:00 2001 From: Javier Date: Sun, 14 Dec 2014 17:19:46 +0100 Subject: add i18n support to UI app also 'es' translation --- app/translations/pebble-es.ts | 254 ++++++++++++++++++++++++++++++++++++++++++ app/translations/pebble.ts | 253 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 507 insertions(+) create mode 100644 app/translations/pebble-es.ts create mode 100644 app/translations/pebble.ts (limited to 'app/translations') diff --git a/app/translations/pebble-es.ts b/app/translations/pebble-es.ts new file mode 100644 index 0000000..7332e4c --- /dev/null +++ b/app/translations/pebble-es.ts @@ -0,0 +1,254 @@ + + + + + AboutPage + + + Version + Versión + + + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + + + + Bugs? + ¿Errores? + + + + AppConfigDialog + + + No configuration settings available + No hay opciones disponibles para configurar + + + + CoverPage + + + connected + conectado + + + + disconnected + desconectado + + + + InstallAppDialog + + + Install app + Instalar app + + + + Install + Instalar + + + + ManagerPage + + + About + Acerca de + + + + Pebble Manager + + + + + Waiting for watch... +If it can't be found please check it's available and paired in Bluetooth settings. + Buscando el reloj +Si esto tarda mucho, comprueba que el reloj esté emparejado correctamente. + + + + Service + Servicio + + + + Enabled + Habilitado + + + + Automatic startup + Inicio automático + + + + Manual startup + Inicio manual + + + + Active + Activo + + + + Running + Ejecutándose + + + + Dead + Detenido + + + + Connection + Conexión + + + + Connected + Conectado + + + + Disconnected + Desconectado + + + + Settings + Configuración + + + + Forward phone calls + Transferir llamadas + + + + Silent when connected + Modo silencio automático + + + + Sets phone profile to "silent" when Pebble is connected + Activa el modo silencio cuando se conecte un Pebble + + + + Transliterate messages + Transliterar mensajes + + + + Messages are transliterated to ASCII before sending to Pebble + Codifica los mensajes entrates a ASCII antes de enviarlos a Pebble + + + + Notifications + Notificaciones + + + + Messaging + Mensajería + + + + SMS and IM + SMS y chat + + + + Missed call + Llamadas perdidas + + + + Emails + Correos electrónicos + + + + Mitakuuluu + + + + + Twitter + Twitter + + + + Facebook + Facebook + + + + Other notifications + Resto de notificaciones + + + + All notifications + Todas las notificaciones + + + + WatchPage + + + Ping + Ping + + + + Sync Time + Ajustar hora + + + + Installed applications + Aplicaciones instaladas + + + + Uninstalling + Desinstalando + + + + (empty slot) + (hueco libre) + + + + (slot in use by unknown app) + (hueco en uso) + + + + Install app... + Instalar app... + + + + Configure... + Configurar... + + + + Uninstall + Desinstalar + + + diff --git a/app/translations/pebble.ts b/app/translations/pebble.ts new file mode 100644 index 0000000..3cc8b6d --- /dev/null +++ b/app/translations/pebble.ts @@ -0,0 +1,253 @@ + + + + + AboutPage + + + Version + + + + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + + + + Bugs? + + + + + AppConfigDialog + + + No configuration settings available + + + + + CoverPage + + + connected + + + + + disconnected + + + + + InstallAppDialog + + + Install app + + + + + Install + + + + + ManagerPage + + + About + + + + + Pebble Manager + + + + + Waiting for watch... +If it can't be found please check it's available and paired in Bluetooth settings. + + + + + Service + + + + + Enabled + + + + + Automatic startup + + + + + Manual startup + + + + + Active + + + + + Running + + + + + Dead + + + + + Connection + + + + + Connected + + + + + Disconnected + + + + + Settings + + + + + Forward phone calls + + + + + Silent when connected + + + + + Sets phone profile to "silent" when Pebble is connected + + + + + Transliterate messages + + + + + Messages are transliterated to ASCII before sending to Pebble + + + + + Notifications + + + + + Messaging + + + + + SMS and IM + + + + + Missed call + + + + + Emails + + + + + Mitakuuluu + + + + + Twitter + + + + + Facebook + + + + + Other notifications + + + + + All notifications + + + + + WatchPage + + + Ping + + + + + Sync Time + + + + + Installed applications + + + + + Uninstalling + + + + + (empty slot) + + + + + (slot in use by unknown app) + + + + + Install app... + + + + + Configure... + + + + + Uninstall + + + + -- cgit v1.2.3 From 6b1ffd680201314171d3e23c7abbec83f32f1dad Mon Sep 17 00:00:00 2001 From: Javier Date: Sun, 14 Dec 2014 17:48:24 +0100 Subject: add progress bar and scroll indicator to appconfig dialog --- app/qml/pages/AppConfigDialog.qml | 16 ++++++++++++++++ app/translations/pebble-es.ts | 2 +- app/translations/pebble.ts | 2 +- 3 files changed, 18 insertions(+), 2 deletions(-) (limited to 'app/translations') diff --git a/app/qml/pages/AppConfigDialog.qml b/app/qml/pages/AppConfigDialog.qml index 65a1f5b..92f188f 100644 --- a/app/qml/pages/AppConfigDialog.qml +++ b/app/qml/pages/AppConfigDialog.qml @@ -33,6 +33,22 @@ Dialog { request.action = WebView.AcceptRequest; } } + + VerticalScrollDecorator { flickable: webview } + } + + ProgressBar { + anchors { + left: parent.left + right: parent.right + bottom: parent.bottom + } + + visible: webview.visible && webview.loading + minimumValue: 0 + maximumValue: 100 + indeterminate: webview.loadProgress === 0 + value: webview.loadProgress } Text { diff --git a/app/translations/pebble-es.ts b/app/translations/pebble-es.ts index 7332e4c..3a8da7d 100644 --- a/app/translations/pebble-es.ts +++ b/app/translations/pebble-es.ts @@ -22,7 +22,7 @@ AppConfigDialog - + No configuration settings available No hay opciones disponibles para configurar diff --git a/app/translations/pebble.ts b/app/translations/pebble.ts index 3cc8b6d..0c61f38 100644 --- a/app/translations/pebble.ts +++ b/app/translations/pebble.ts @@ -22,7 +22,7 @@ AppConfigDialog - + No configuration settings available -- cgit v1.2.3 From e1d94fc21ecbce16815810c4f274f349b49e82a3 Mon Sep 17 00:00:00 2001 From: Javier Date: Sun, 21 Dec 2014 21:03:18 +0100 Subject: add itemselector to the appconfig webview --- app/app.pro | 1 + app/qml/pages/AppConfigDialog.qml | 18 ++++++++++++++- app/qml/pages/WebItemSelDialog.qml | 45 ++++++++++++++++++++++++++++++++++++++ app/translations/pebble-es.ts | 2 +- app/translations/pebble.ts | 2 +- 5 files changed, 65 insertions(+), 3 deletions(-) create mode 100644 app/qml/pages/WebItemSelDialog.qml (limited to 'app/translations') diff --git a/app/app.pro b/app/app.pro index ca03ab1..97c6232 100644 --- a/app/app.pro +++ b/app/app.pro @@ -25,6 +25,7 @@ OTHER_FILES += \ qml/pages/AboutPage.qml \ qml/pages/InstallAppDialog.qml \ qml/pages/AppConfigDialog.qml \ + qml/pages/WebItemSelDialog.qml \ qml/pebble.qml \ qml/images/* \ translations/*.ts \ diff --git a/app/qml/pages/AppConfigDialog.qml b/app/qml/pages/AppConfigDialog.qml index 92f188f..304bced 100644 --- a/app/qml/pages/AppConfigDialog.qml +++ b/app/qml/pages/AppConfigDialog.qml @@ -19,6 +19,8 @@ Dialog { title: "Configuring " + name } + VerticalScrollDecorator { flickable: webview } + onNavigationRequested: { console.log("appconfig navigation requested to " + request.url); var url = request.url.toString(); @@ -34,7 +36,21 @@ Dialog { } } - VerticalScrollDecorator { flickable: webview } + experimental.itemSelector: Component { + Item { + Component.onCompleted: { + var dialog = pageStack.push(Qt.resolvedUrl("WebItemSelDialog.qml"), { + model: model.items + }); + dialog.onRejected.connect(function() { + model.reject(); + }); + dialog.onAccepted.connect(function() { + model.accept(dialog.selectedIndex); + }); + } + } + } } ProgressBar { diff --git a/app/qml/pages/WebItemSelDialog.qml b/app/qml/pages/WebItemSelDialog.qml new file mode 100644 index 0000000..f8c49f2 --- /dev/null +++ b/app/qml/pages/WebItemSelDialog.qml @@ -0,0 +1,45 @@ +import QtQuick 2.0 +import QtQml 2.1 +import Sailfish.Silica 1.0 + +Dialog { + id: itemSelDialog + property alias model: listView.model + property int selectedIndex: -1 + + SilicaListView { + id: listView + anchors.fill: parent + + VerticalScrollDecorator { flickable: webview } + + header: PageHeader { + } + + delegate: ListItem { + id: itemDelegate + contentHeight: Theme.itemSizeSmall + + Label { + anchors { + left: parent.left + leftMargin: Theme.paddingMedium + right: parent.right + rightMargin: Theme.paddingMedium + verticalCenter: parent.verticalCenter + } + text: model.text + color: model.enabled ? + (itemDelegate.highlighted ? Theme.highlightColor : Theme.primaryColor) + : Theme.secondaryColor + truncationMode: TruncationMode.Fade + } + + enabled: model.enabled + onClicked: { + selectedIndex = model.index; + accept(); + } + } + } +} diff --git a/app/translations/pebble-es.ts b/app/translations/pebble-es.ts index 3a8da7d..18b1ec2 100644 --- a/app/translations/pebble-es.ts +++ b/app/translations/pebble-es.ts @@ -22,7 +22,7 @@ AppConfigDialog - + No configuration settings available No hay opciones disponibles para configurar diff --git a/app/translations/pebble.ts b/app/translations/pebble.ts index 0c61f38..222645c 100644 --- a/app/translations/pebble.ts +++ b/app/translations/pebble.ts @@ -22,7 +22,7 @@ AppConfigDialog - + No configuration settings available -- cgit v1.2.3 From e6ec758b364fcaf9fda35e56740c3fcd7e8fe25e Mon Sep 17 00:00:00 2001 From: Javier Date: Sun, 21 Dec 2014 22:36:14 +0100 Subject: use overridePageStackNavigation to ensure accept() works --- app/qml/pages/AppConfigDialog.qml | 2 ++ app/translations/pebble-es.ts | 2 +- app/translations/pebble.ts | 2 +- rpm/pebble.spec | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) (limited to 'app/translations') diff --git a/app/qml/pages/AppConfigDialog.qml b/app/qml/pages/AppConfigDialog.qml index 304bced..1562985 100644 --- a/app/qml/pages/AppConfigDialog.qml +++ b/app/qml/pages/AppConfigDialog.qml @@ -21,6 +21,8 @@ Dialog { VerticalScrollDecorator { flickable: webview } + overridePageStackNavigation: true + onNavigationRequested: { console.log("appconfig navigation requested to " + request.url); var url = request.url.toString(); diff --git a/app/translations/pebble-es.ts b/app/translations/pebble-es.ts index 18b1ec2..0316ecb 100644 --- a/app/translations/pebble-es.ts +++ b/app/translations/pebble-es.ts @@ -22,7 +22,7 @@ AppConfigDialog - + No configuration settings available No hay opciones disponibles para configurar diff --git a/app/translations/pebble.ts b/app/translations/pebble.ts index 222645c..7a78d9d 100644 --- a/app/translations/pebble.ts +++ b/app/translations/pebble.ts @@ -22,7 +22,7 @@ AppConfigDialog - + No configuration settings available diff --git a/rpm/pebble.spec b/rpm/pebble.spec index 9fb9575..02cbe6c 100644 --- a/rpm/pebble.spec +++ b/rpm/pebble.spec @@ -13,7 +13,7 @@ Name: pebble %{!?qtc_make:%define qtc_make make} %{?qtc_builddir:%define _builddir %qtc_builddir} Summary: Support for Pebble watch in SailfishOS -Version: 0.12.1b +Version: 0.12.1c Release: 1 Group: Qt/Qt License: GPL3 -- cgit v1.2.3