Merge lp:~unity-api-team/indicator-network/add-cellular-data-switch-string into lp:indicator-network

[Antti Kaijanmäki]

Add cellular data switch to the factory to introduce the translatable string.

Add string for cellular data switch as per spec:
https://wiki.ubuntu.com/Networking#A.2BIBw-Cellular.2BIB0_settings

This MP does not change functionality.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:582
http://jenkins.qa.ubuntu.com/job/indicator-network-ci/419/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-network-wily-amd64-ci/71/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-network-wily-armhf-ci/71/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-network-ci/419/rebuild

review: Needs Fixing (continuous-integration)

[lp:~unity-api-team/indicator-network/add-cellular-data-switch-string]

583. By Antti Kaijanmäki on 2016-04-29

revert .pot update

[dobey (dobey)]

Approved, but would prefer to not have commented out code (at least not in this manner, #if 0 or /**/ with comment about why its disabled would be better.

Also think the pot update should remain, but I don't know what all this project does in that respect.

review: Approve

[lp:~unity-api-team/indicator-network/add-cellular-data-switch-string]

584. By Antti Kaijanmäki on 2016-04-29

revert the revert

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:583
http://jenkins.qa.ubuntu.com/job/indicator-network-ci/420/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-network-wily-amd64-ci/72/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-network-wily-armhf-ci/72/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-network-ci/420/rebuild

review: Needs Fixing (continuous-integration)

[lp:~unity-api-team/indicator-network/add-cellular-data-switch-string]

585. By Antti Kaijanmäki on 2016-04-29

remove comments.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:585
http://jenkins.qa.ubuntu.com/job/indicator-network-ci/421/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-network-wily-amd64-ci/73/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-network-wily-armhf-ci/73/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-network-ci/421/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'po/indicator-network.pot'
--- po/indicator-network.pot	2015-12-17 10:41:14 +0000
+++ po/indicator-network.pot	2016-04-29 14:20:56 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-17 10:40+0000\n"
+"POT-Creation-Date: 2016-04-29 12:38+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -18,6 +18,86 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
+#: ../src/agent/SecretRequest.cpp:61
+msgid "Connect to “%1”"
+msgstr ""
+
+#: ../src/agent/SecretRequest.cpp:66
+msgid "WPA"
+msgstr ""
+
+#: ../src/agent/SecretRequest.cpp:68
+msgid "WEP"
+msgstr ""
+
+#: ../src/agent/SecretRequest.cpp:74
+msgid "Connect"
+msgstr ""
+
+#: ../src/agent/SecretRequest.cpp:75
+msgid "Cancel"
+msgstr ""
+
+#: ../src/indicator/menuitems/wifi-link-item.cpp:109
+msgid "Other network…"
+msgstr ""
+
+#: ../src/indicator/menuitems/wwan-link-item.cpp:90
+msgid "No SIM"
+msgstr ""
+
+#: ../src/indicator/menuitems/wwan-link-item.cpp:97
+msgid "SIM Error"
+msgstr ""
+
+#: ../src/indicator/menuitems/wwan-link-item.cpp:105
+msgid "SIM Locked"
+msgstr ""
+
+#: ../src/indicator/menuitems/wwan-link-item.cpp:118
+msgid "Unregistered"
+msgstr ""
+
+#: ../src/indicator/menuitems/wwan-link-item.cpp:123
+msgid "Unknown"
+msgstr ""
+
+#: ../src/indicator/menuitems/wwan-link-item.cpp:128
+msgid "Denied"
+msgstr ""
+
+#: ../src/indicator/menuitems/wwan-link-item.cpp:133
+msgid "Searching"
+msgstr ""
+
+#: ../src/indicator/menuitems/wwan-link-item.cpp:145
+msgid "No Signal"
+msgstr ""
+
+#: ../src/indicator/menuitems/wwan-link-item.cpp:157
+#: ../src/indicator/menuitems/wwan-link-item.cpp:164
+msgid "Offline"
+msgstr ""
+
+#. TODO Move this into a new class
+#: ../src/indicator/factory.cpp:187
+msgid "Wi-Fi"
+msgstr ""
+
+#. TODO Move this into a new class
+#: ../src/indicator/factory.cpp:198
+msgid "Flight Mode"
+msgstr ""
+
+#: ../src/indicator/factory.cpp:208
+msgid "Cellular data"
+msgstr ""
+
+#. TODO Move this into a new class
+#: ../src/indicator/factory.cpp:219
+msgid "Hotspot"
+msgstr ""
+
 #: ../src/indicator/sim-unlock-dialog.cpp:144
 msgid "Sorry, incorrect %{1} PIN."
 msgstr ""
@@ -153,24 +233,16 @@
 msgid "VPN Connection Failed"
 msgstr ""
 
-#: ../src/indicator/agent/SecretRequest.cpp:61
-msgid "Connect to “%1”"
-msgstr ""
-
-#: ../src/indicator/agent/SecretRequest.cpp:66
-msgid "WPA"
-msgstr ""
-
-#: ../src/indicator/agent/SecretRequest.cpp:68
-msgid "WEP"
-msgstr ""
-
-#: ../src/indicator/agent/SecretRequest.cpp:74
-msgid "Connect"
-msgstr ""
-
-#: ../src/indicator/agent/SecretRequest.cpp:75
-msgid "Cancel"
+#: ../src/indicator/sections/wwan-section.cpp:99
+msgid "Cellular settings…"
+msgstr ""
+
+#: ../src/indicator/sections/vpn-section.cpp:140
+msgid "VPN settings…"
+msgstr ""
+
+#: ../src/indicator/sections/wifi-section.cpp:65
+msgid "Wi-Fi settings…"
 msgstr ""
 
 #. TRANSLATORS: this is the indicator title shown on the top header of the indicator area
@@ -178,74 +250,6 @@
 msgid "Network"
 msgstr ""
 
-#: ../src/indicator/menuitems/wwan-link-item.cpp:90
-msgid "No SIM"
-msgstr ""
-
-#: ../src/indicator/menuitems/wwan-link-item.cpp:97
-msgid "SIM Error"
-msgstr ""
-
-#: ../src/indicator/menuitems/wwan-link-item.cpp:105
-msgid "SIM Locked"
-msgstr ""
-
-#: ../src/indicator/menuitems/wwan-link-item.cpp:118
-msgid "Unregistered"
-msgstr ""
-
-#: ../src/indicator/menuitems/wwan-link-item.cpp:123
-msgid "Unknown"
-msgstr ""
-
-#: ../src/indicator/menuitems/wwan-link-item.cpp:128
-msgid "Denied"
-msgstr ""
-
-#: ../src/indicator/menuitems/wwan-link-item.cpp:133
-msgid "Searching"
-msgstr ""
-
-#: ../src/indicator/menuitems/wwan-link-item.cpp:145
-msgid "No Signal"
-msgstr ""
-
-#: ../src/indicator/menuitems/wwan-link-item.cpp:157
-#: ../src/indicator/menuitems/wwan-link-item.cpp:164
-msgid "Offline"
-msgstr ""
-
-#: ../src/indicator/menuitems/wifi-link-item.cpp:109
-msgid "Other network…"
-msgstr ""
-
 #: ../src/indicator/nmofono/vpn/vpn-manager.cpp:81
 msgid "VPN connection %1"
 msgstr ""
-
-#. TODO Move this into a new class
-#: ../src/indicator/factory.cpp:187
-msgid "Wi-Fi"
-msgstr ""
-
-#. TODO Move this into a new class
-#: ../src/indicator/factory.cpp:198
-msgid "Flight Mode"
-msgstr ""
-
-#. TODO Move this into a new class
-#: ../src/indicator/factory.cpp:209
-msgid "Hotspot"
-msgstr ""
-
-#: ../src/indicator/sections/wifi-section.cpp:65
-msgid "Wi-Fi settings…"
-msgstr ""
-
-#: ../src/indicator/sections/wwan-section.cpp:99
-msgid "Cellular settings…"
-msgstr ""
-
-#: ../src/indicator/sections/vpn-section.cpp:140
-msgid "VPN settings…"
-msgstr ""

=== modified file 'src/indicator/factory.cpp'
--- src/indicator/factory.cpp	2016-02-15 09:31:38 +0000
+++ src/indicator/factory.cpp	2016-04-29 14:20:56 +0000
@@ -203,6 +203,12 @@
     return flightModeSwitch;
 }
 
+SwitchItem::UPtr Factory::newMobileDataSwitch()
+{
+    auto s = make_unique<SwitchItem>(_("Cellular data"), "mobiledata", "enabled");
+    return s;
+}
+
 SwitchItem::UPtr Factory::newHotspotSwitch()
 {
     // TODO Move this into a new class

=== modified file 'src/indicator/factory.h'
--- src/indicator/factory.h	2016-02-15 09:31:38 +0000
+++ src/indicator/factory.h	2016-04-29 14:20:56 +0000
@@ -68,6 +68,8 @@
 
     virtual SwitchItem::UPtr newWifiSwitch();
 
+    virtual SwitchItem::UPtr newMobileDataSwitch();
+
     virtual SwitchItem::UPtr newFlightModeSwitch();
 
     virtual SwitchItem::UPtr newHotspotSwitch();