Merge lp:~snwh/switchboard-plug-security-privacy/improved-strings into lp:~elementary-apps/switchboard-plug-security-privacy/trunk

[Sam Hewitt]

Updated a few strings to improve comprehension & inverted a switch.

To improve the comprehension of what the plug is doing, I've updated a few of the strings in the UI

1. Changed "Gather Statistics" to "Privacy Mode" –this will also need the switch to be inverted
2. Changed "Record:" to "Data Sources"
3. Changed "Do Not Record:" to "Do not collect data from the following."

[Danielle Foré (danrabbit)]

Colons please :)

Also the Switch still needs work to completely invert the functionality. In this branch, your grid sensitivity is the opposite of what it should be and you've not changed what actually happens when the switch is on vs off. You've only set the default position of the switch :p

review: Needs Fixing

[lp:~snwh/switchboard-plug-security-privacy/improved-strings]

73. By Sam Hewitt on 2014-08-26

Updated code to match the switch change.

[Sam Hewitt (snwh)]

Fixed.

[Cody Garver (codygarver)]

Diff line 18 has a typo that causes compilation failure

Is there supposed to be a colon after Privacy Mode?

review: Needs Fixing

[lp:~snwh/switchboard-plug-security-privacy/improved-strings]

74. By Sam Hewitt on 2014-08-31

Fixed typo

75. By Sam Hewitt on 2014-08-31

Added missing colon.

[Sam Hewitt (snwh)]

Bloody hell, I must have made the error after I compiled myself.

[Danielle Foré (danrabbit)]

Okay, seems to build and sensitively is set properly and colons are good. I've no idea how to verify if the privacy mode is working correctly, but other stuff looks good to me :)

review: Approve (ux)

[Sam Hewitt (snwh)]

I did check it against the gsettings keys that it changes to enable/disable privacy features.

=== modified file 'src/TrackPanel.vala'
--- src/TrackPanel.vala	2014-08-02 22:41:18 +0000
+++ src/TrackPanel.vala	2014-08-31 16:19:38 +0000
@@ -59,13 +59,13 @@
         margin_top = 0;
 
         var record_label = new Gtk.Label ("");
-        record_label.set_markup ("<b>%s</b>".printf (_("Gather statistics:")));
+        record_label.set_markup ("<b>%s</b>".printf (_("Privacy Mode:")));
 
         var record_switch = new Gtk.Switch ();
-        record_switch.active = true;
+        record_switch.active = false;
         record_switch.notify["active"].connect (() => {
-            record_grid.sensitive = record_switch.active;
-            exclude_grid.sensitive = record_switch.active;
+            record_grid.sensitive = !record_switch.active;
+            exclude_grid.sensitive = !record_switch.active;
             var recording = !blacklist.get_incognito ();
             if (record_switch.active != recording) {
                 blacklist.set_incognito (recording);
@@ -287,7 +287,7 @@
         scrolled.expand = true;
         scrolled.add (view);
 
-        var record_label = new Gtk.Label (_("Record:"));
+        var record_label = new Gtk.Label (_("Data Sources:"));
         record_label.xalign = 0;
 
         record_grid = new Gtk.Grid ();
@@ -401,7 +401,7 @@
         frame_grid.add (scrolled);
         frame_grid.add (list_toolbar);
 
-        var record_label = new Gtk.Label (_("Do not record:"));
+        var record_label = new Gtk.Label (_("Do not collect data from the following:"));
         record_label.xalign = 0;
 
         exclude_grid = new Gtk.Grid ();