ubuntu-touch-coreapps-reviewers team mailing list archive

[Niklas Wenzel <nikwen.developer@xxxxxxxxx>]

Niklas Wenzel has proposed merging lp:~nikwen/ubuntu-terminal-app/color-scheme-name-mapping into lp:ubuntu-terminal-app.

Commit message:
Display proper translatable names for color schemes instead of their file names

Requested reviews:
  Stefano Verzegnassi (verzegnassi-stefano)
  Ubuntu Terminal Developers (ubuntu-terminal-dev)

For more details, see:
https://code.launchpad.net/~nikwen/ubuntu-terminal-app/color-scheme-name-mapping/+merge/285297

Display proper translatable names for color schemes instead of their file names
-- 
Your team Ubuntu Terminal Developers is requested to review the proposed merge of lp:~nikwen/ubuntu-terminal-app/color-scheme-name-mapping into lp:ubuntu-terminal-app.

=== modified file 'po/com.ubuntu.terminal.pot'
--- po/com.ubuntu.terminal.pot	2016-02-06 18:18:42 +0000
+++ po/com.ubuntu.terminal.pot	2016-02-07 18:31:40 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-06 17:44+0100\n"
+"POT-Creation-Date: 2016-02-07 19:27+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -53,7 +53,7 @@
 msgid "Authentication failed"
 msgstr ""
 
-#: ../src/app/qml/ColorSchemePage.qml:26 ../src/app/qml/SettingsPage.qml:124
+#: ../src/app/qml/ColorSchemePage.qml:26 ../src/app/qml/SettingsPage.qml:129
 msgid "Color Scheme"
 msgstr ""
 
@@ -153,7 +153,7 @@
 msgid "ENTER"
 msgstr ""
 
-#: ../src/app/qml/LayoutsPage.qml:26 ../src/app/qml/SettingsPage.qml:42
+#: ../src/app/qml/LayoutsPage.qml:26 ../src/app/qml/SettingsPage.qml:41
 msgid "Layouts"
 msgstr ""
 
@@ -169,7 +169,7 @@
 msgid "Show Keyboard Button"
 msgstr ""
 
-#: ../src/app/qml/SettingsPage.qml:91
+#: ../src/app/qml/SettingsPage.qml:96
 msgid "Font Size:"
 msgstr ""
 
@@ -185,6 +185,43 @@
 msgid "Selection Mode"
 msgstr ""
 
+#. TRANSLATORS: This is the name of a terminal color scheme which is displayed in the settings
+#: ../src/app/qml/ubuntu-terminal-app.qml:128
+msgid "Green on black"
+msgstr ""
+
+#: ../src/app/qml/ubuntu-terminal-app.qml:128
+msgid "White on black"
+msgstr ""
+
+#: ../src/app/qml/ubuntu-terminal-app.qml:128
+msgid "Black on white"
+msgstr ""
+
+#: ../src/app/qml/ubuntu-terminal-app.qml:128
+msgid "Black on random light"
+msgstr ""
+
+#: ../src/app/qml/ubuntu-terminal-app.qml:128
+msgid "Linux"
+msgstr ""
+
+#: ../src/app/qml/ubuntu-terminal-app.qml:128
+msgid "Cool retro term"
+msgstr ""
+
+#: ../src/app/qml/ubuntu-terminal-app.qml:128
+msgid "Dark pastels / Ubuntu (old)"
+msgstr ""
+
+#: ../src/app/qml/ubuntu-terminal-app.qml:128
+msgid "Black on light yellow"
+msgstr ""
+
+#: ../src/app/qml/ubuntu-terminal-app.qml:128
+msgid "Ubuntu"
+msgstr ""
+
 #: ../src/plugin/konsole/ColorScheme.cpp:276
 #: ../src/plugin/konsole/ColorScheme.cpp:291
 #: ../src/plugin/qmltermwidget/lib/ColorScheme.cpp:277

=== modified file 'src/app/qml/ColorSchemePage.qml'
--- src/app/qml/ColorSchemePage.qml	2016-02-06 17:50:00 +0000
+++ src/app/qml/ColorSchemePage.qml	2016-02-07 18:31:40 +0000
@@ -24,7 +24,11 @@
     objectName: "colorSchemePage"
 
     title: i18n.tr("Color Scheme")
+
     property alias model: listView.model
+    property var namesModel
+
+    readonly property string currentName: namesModel[listView.currentIndex]
 
     ListView {
         id: listView
@@ -34,7 +38,7 @@
         delegate: ListItem {
             ListItemLayout {
                 anchors.verticalCenter: parent.verticalCenter
-                title.text: modelData
+                title.text: namesModel[model.index]
 
                 Icon {
                     SlotsLayout.position: SlotsLayout.Last

=== modified file 'src/app/qml/SettingsPage.qml'
--- src/app/qml/SettingsPage.qml	2016-02-06 16:58:50 +0000
+++ src/app/qml/SettingsPage.qml	2016-02-07 18:31:40 +0000
@@ -130,7 +130,7 @@
 
                     Label {
                         SlotsLayout.position: SlotsLayout.Trailing
-                        text: settings.colorScheme
+                        text: colorSchemePage.currentName
                     }
 
                     Icon {

=== modified file 'src/app/qml/ubuntu-terminal-app.qml'
--- src/app/qml/ubuntu-terminal-app.qml	2016-01-29 02:16:38 +0000
+++ src/app/qml/ubuntu-terminal-app.qml	2016-02-07 18:31:40 +0000
@@ -123,6 +123,9 @@
             // TODO This is a workaround at the moment.
             // The application should get them from the c++.
             model: ["GreenOnBlack","WhiteOnBlack","BlackOnWhite","BlackOnRandomLight","Linux","cool-retro-term","DarkPastels","BlackOnLightYellow", "Ubuntu"]
+
+            // TRANSLATORS: This is the name of a terminal color scheme which is displayed in the settings
+            namesModel: [i18n.tr("Green on black"),i18n.tr("White on black"),i18n.tr("Black on white"),i18n.tr("Black on random light"),i18n.tr("Linux"),i18n.tr("Cool retro term"),i18n.tr("Dark pastels / Ubuntu (old)"),i18n.tr("Black on light yellow"),i18n.tr("Ubuntu")]
         }
     }