Merge lp:~voldyman/switchboard-plug-networking/missing-unknown into lp:~elementary-pantheon/switchboard-plug-networking/trunk

Proposed by Akshay Shekher
Status: Rejected
Rejected by: xapantu
Proposed branch: lp:~voldyman/switchboard-plug-networking/missing-unknown
Merge into: lp:~elementary-pantheon/switchboard-plug-networking/trunk
Diff against target: 36 lines (+4/-4)
1 file modified
src/Utils.vala (+4/-4)
To merge this branch: bzr merge lp:~voldyman/switchboard-plug-networking/missing-unknown
Reviewer Review Type Date Requested Status
Adam Bieńkowski (community) Abstain
Rico Tzschichholz Disapprove
Artem Anufrij Pending
Review via email: mp+270238@code.launchpad.net

Description of the change

made the missing "Unknown"'s translatable.

To post a comment you must log in.
Revision history for this message
Rico Tzschichholz (ricotz) :
review: Disapprove
Revision history for this message
Akshay Shekher (voldyman) wrote :

what do i need to fix?

Revision history for this message
Rico Tzschichholz (ricotz) wrote :

Better fix all existing appearances of _(UNKNOWN) which is awfully wrong

Revision history for this message
Adam Bieńkowski (donadigo) wrote :

Okay, i think I will take care of that and totally remove the constant because it's sensless.

review: Abstain
Revision history for this message
xapantu (xapantu) wrote :

Thanks for pointing this out, I just pushed an equivalent fix.

Unmerged revisions

159. By Akshay Shekher

translate missing 'Unknown'

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/Utils.vala'
--- src/Utils.vala 2015-08-06 13:07:20 +0000
+++ src/Utils.vala 2015-09-05 09:00:38 +0000
@@ -29,7 +29,7 @@
29 public string state_to_string (NM.DeviceState state) {29 public string state_to_string (NM.DeviceState state) {
30 switch (state) {30 switch (state) {
31 case NM.DeviceState.UNKNOWN:31 case NM.DeviceState.UNKNOWN:
32 return UNKNOWN;32 return _(UNKNOWN);
33 case NM.DeviceState.ACTIVATED:33 case NM.DeviceState.ACTIVATED:
34 return _("Connected");34 return _("Connected");
35 case NM.DeviceState.DISCONNECTED:35 case NM.DeviceState.DISCONNECTED:
@@ -54,13 +54,13 @@
54 return _("Failed to connect");54 return _("Failed to connect");
55 }55 }
5656
57 return UNKNOWN;57 return _(UNKNOWN);
58 }58 }
5959
60 public string type_to_string (NM.DeviceType type) {60 public string type_to_string (NM.DeviceType type) {
61 switch (type) {61 switch (type) {
62 case NM.DeviceType.UNKNOWN:62 case NM.DeviceType.UNKNOWN:
63 return UNKNOWN;63 return _(UNKNOWN);
64 case NM.DeviceType.ETHERNET:64 case NM.DeviceType.ETHERNET:
65 return _("Ethernet");65 return _("Ethernet");
66 case NM.DeviceType.WIFI:66 case NM.DeviceType.WIFI:
@@ -89,6 +89,6 @@
89 return _("Bridge master");89 return _("Bridge master");
90 }90 }
9191
92 return UNKNOWN;92 return _(UNKNOWN);
93 }93 }
94}94}

Subscribers

People subscribed via source and target branches