Network Menu

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

  1. add-cellular-data-switch-string
  2. Merge into trunk
Proposed by Antti Kaijanmäki
Status: Merged
Approved by: dobey
Approved revision: 585
Merged at revision: 581
Proposed branch: lp:~unity-api-team/indicator-network/add-cellular-data-switch-string
Merge into: lp:indicator-network
Diff against target: 239 lines (+99/-87)
3 files modified
po/indicator-network.pot (+91/-87)
src/indicator/factory.cpp (+6/-0)
src/indicator/factory.h (+2/-0)
To merge this branch: bzr merge lp:~unity-api-team/indicator-network/add-cellular-data-switch-string
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
dobey (community) Approve
Review via email: mp+293371@code.launchpad.net

Commit message

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

Description of the change

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.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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 updated
583. By Antti Kaijanmäki

revert .pot update

Revision history for this message
dobey (dobey) wrote :

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 updated
584. By Antti Kaijanmäki

revert the revert

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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 updated
585. By Antti Kaijanmäki

remove comments.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
8msgstr ""8msgstr ""
9"Project-Id-Version: PACKAGE VERSION\n"9"Project-Id-Version: PACKAGE VERSION\n"
10"Report-Msgid-Bugs-To: \n"10"Report-Msgid-Bugs-To: \n"
11"POT-Creation-Date: 2015-12-17 10:40+0000\n"11"POT-Creation-Date: 2016-04-29 12:38+0300\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"14"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,6 +18,86 @@
18"Content-Transfer-Encoding: 8bit\n"18"Content-Transfer-Encoding: 8bit\n"
19"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"19"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
2020
21#: ../src/agent/SecretRequest.cpp:61
22msgid "Connect to “%1”"
23msgstr ""
24
25#: ../src/agent/SecretRequest.cpp:66
26msgid "WPA"
27msgstr ""
28
29#: ../src/agent/SecretRequest.cpp:68
30msgid "WEP"
31msgstr ""
32
33#: ../src/agent/SecretRequest.cpp:74
34msgid "Connect"
35msgstr ""
36
37#: ../src/agent/SecretRequest.cpp:75
38msgid "Cancel"
39msgstr ""
40
41#: ../src/indicator/menuitems/wifi-link-item.cpp:109
42msgid "Other network…"
43msgstr ""
44
45#: ../src/indicator/menuitems/wwan-link-item.cpp:90
46msgid "No SIM"
47msgstr ""
48
49#: ../src/indicator/menuitems/wwan-link-item.cpp:97
50msgid "SIM Error"
51msgstr ""
52
53#: ../src/indicator/menuitems/wwan-link-item.cpp:105
54msgid "SIM Locked"
55msgstr ""
56
57#: ../src/indicator/menuitems/wwan-link-item.cpp:118
58msgid "Unregistered"
59msgstr ""
60
61#: ../src/indicator/menuitems/wwan-link-item.cpp:123
62msgid "Unknown"
63msgstr ""
64
65#: ../src/indicator/menuitems/wwan-link-item.cpp:128
66msgid "Denied"
67msgstr ""
68
69#: ../src/indicator/menuitems/wwan-link-item.cpp:133
70msgid "Searching"
71msgstr ""
72
73#: ../src/indicator/menuitems/wwan-link-item.cpp:145
74msgid "No Signal"
75msgstr ""
76
77#: ../src/indicator/menuitems/wwan-link-item.cpp:157
78#: ../src/indicator/menuitems/wwan-link-item.cpp:164
79msgid "Offline"
80msgstr ""
81
82#. TODO Move this into a new class
83#: ../src/indicator/factory.cpp:187
84msgid "Wi-Fi"
85msgstr ""
86
87#. TODO Move this into a new class
88#: ../src/indicator/factory.cpp:198
89msgid "Flight Mode"
90msgstr ""
91
92#: ../src/indicator/factory.cpp:208
93msgid "Cellular data"
94msgstr ""
95
96#. TODO Move this into a new class
97#: ../src/indicator/factory.cpp:219
98msgid "Hotspot"
99msgstr ""
100
21#: ../src/indicator/sim-unlock-dialog.cpp:144101#: ../src/indicator/sim-unlock-dialog.cpp:144
22msgid "Sorry, incorrect %{1} PIN."102msgid "Sorry, incorrect %{1} PIN."
23msgstr ""103msgstr ""
@@ -153,24 +233,16 @@
153msgid "VPN Connection Failed"233msgid "VPN Connection Failed"
154msgstr ""234msgstr ""
155235
156#: ../src/indicator/agent/SecretRequest.cpp:61236#: ../src/indicator/sections/wwan-section.cpp:99
157msgid "Connect to “%1”"237msgid "Cellular settings…"
158msgstr ""238msgstr ""
159239
160#: ../src/indicator/agent/SecretRequest.cpp:66240#: ../src/indicator/sections/vpn-section.cpp:140
161msgid "WPA"241msgid "VPN settings…"
162msgstr ""242msgstr ""
163243
164#: ../src/indicator/agent/SecretRequest.cpp:68244#: ../src/indicator/sections/wifi-section.cpp:65
165msgid "WEP"245msgid "Wi-Fi settings…"
166msgstr ""
167
168#: ../src/indicator/agent/SecretRequest.cpp:74
169msgid "Connect"
170msgstr ""
171
172#: ../src/indicator/agent/SecretRequest.cpp:75
173msgid "Cancel"
174msgstr ""246msgstr ""
175247
176#. TRANSLATORS: this is the indicator title shown on the top header of the indicator area248#. TRANSLATORS: this is the indicator title shown on the top header of the indicator area
@@ -178,74 +250,6 @@
178msgid "Network"250msgid "Network"
179msgstr ""251msgstr ""
180252
181#: ../src/indicator/menuitems/wwan-link-item.cpp:90
182msgid "No SIM"
183msgstr ""
184
185#: ../src/indicator/menuitems/wwan-link-item.cpp:97
186msgid "SIM Error"
187msgstr ""
188
189#: ../src/indicator/menuitems/wwan-link-item.cpp:105
190msgid "SIM Locked"
191msgstr ""
192
193#: ../src/indicator/menuitems/wwan-link-item.cpp:118
194msgid "Unregistered"
195msgstr ""
196
197#: ../src/indicator/menuitems/wwan-link-item.cpp:123
198msgid "Unknown"
199msgstr ""
200
201#: ../src/indicator/menuitems/wwan-link-item.cpp:128
202msgid "Denied"
203msgstr ""
204
205#: ../src/indicator/menuitems/wwan-link-item.cpp:133
206msgid "Searching"
207msgstr ""
208
209#: ../src/indicator/menuitems/wwan-link-item.cpp:145
210msgid "No Signal"
211msgstr ""
212
213#: ../src/indicator/menuitems/wwan-link-item.cpp:157
214#: ../src/indicator/menuitems/wwan-link-item.cpp:164
215msgid "Offline"
216msgstr ""
217
218#: ../src/indicator/menuitems/wifi-link-item.cpp:109
219msgid "Other network…"
220msgstr ""
221
222#: ../src/indicator/nmofono/vpn/vpn-manager.cpp:81253#: ../src/indicator/nmofono/vpn/vpn-manager.cpp:81
223msgid "VPN connection %1"254msgid "VPN connection %1"
224msgstr ""255msgstr ""
225
226#. TODO Move this into a new class
227#: ../src/indicator/factory.cpp:187
228msgid "Wi-Fi"
229msgstr ""
230
231#. TODO Move this into a new class
232#: ../src/indicator/factory.cpp:198
233msgid "Flight Mode"
234msgstr ""
235
236#. TODO Move this into a new class
237#: ../src/indicator/factory.cpp:209
238msgid "Hotspot"
239msgstr ""
240
241#: ../src/indicator/sections/wifi-section.cpp:65
242msgid "Wi-Fi settings…"
243msgstr ""
244
245#: ../src/indicator/sections/wwan-section.cpp:99
246msgid "Cellular settings…"
247msgstr ""
248
249#: ../src/indicator/sections/vpn-section.cpp:140
250msgid "VPN settings…"
251msgstr ""
252256
=== 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 @@
203 return flightModeSwitch;203 return flightModeSwitch;
204}204}
205205
206SwitchItem::UPtr Factory::newMobileDataSwitch()
207{
208 auto s = make_unique<SwitchItem>(_("Cellular data"), "mobiledata", "enabled");
209 return s;
210}
211
206SwitchItem::UPtr Factory::newHotspotSwitch()212SwitchItem::UPtr Factory::newHotspotSwitch()
207{213{
208 // TODO Move this into a new class214 // TODO Move this into a new class
209215
=== 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 @@
6868
69 virtual SwitchItem::UPtr newWifiSwitch();69 virtual SwitchItem::UPtr newWifiSwitch();
7070
71 virtual SwitchItem::UPtr newMobileDataSwitch();
72
71 virtual SwitchItem::UPtr newFlightModeSwitch();73 virtual SwitchItem::UPtr newFlightModeSwitch();
7274
73 virtual SwitchItem::UPtr newHotspotSwitch();75 virtual SwitchItem::UPtr newHotspotSwitch();

Subscribers

People subscribed via source and target branches