Merge lp:~ken-vandine/ubuntu-system-settings/lp1545021 into lp:ubuntu-system-settings

[Ken VanDine]

Don't use the cellular portion of the location accuracy string when there is no modem available

Don't use the cellular portion of the location accuracy string when there is no modem available

[lp:~ken-vandine/ubuntu-system-settings/lp1545021]

1597. By Ken VanDine on 2016-02-12

improved grammar

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1597
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2615/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6454
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/389
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/798
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4939
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6465
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6465/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27552

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2615/rebuild

review: Needs Fixing (continuous-integration)

[lp:~ken-vandine/ubuntu-system-settings/lp1545021]

1598. By Ken VanDine on 2016-02-12

fixed syntax error

=== modified file 'plugins/security-privacy/Location.qml'
--- plugins/security-privacy/Location.qml	2016-02-04 15:28:51 +0000
+++ plugins/security-privacy/Location.qml	2016-02-12 21:16:13 +0000
@@ -24,6 +24,7 @@
 import QtQuick 2.4
 import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.3 as ListItem
+import Ubuntu.Connectivity 1.0
 import Ubuntu.SystemSettings.SecurityPrivacy 1.0
 import SystemSettings 1.0
 
@@ -182,7 +183,9 @@
                             terms and conditions reside (typically a qml file).
                             HERE is a Nokia trademark, so it should probably
                             not be translated. */
-                            name: i18n.tr("Using GPS, anonymized Wi-Fi and cellular network info.<br>By selecting this option you accept the <a href='%1'>Nokia HERE terms and conditions</a>.").arg("here-terms.qml"),
+                            name: NetworkingStatus.modemAvailable ?
+                                i18n.tr("Using GPS, anonymized Wi-Fi and cellular network info.<br>By selecting this option you accept the <a href='%1'>Nokia HERE terms and conditions</a>.").arg("here-terms.qml") :
+                                i18n.tr("Using GPS and anonymized Wi-Fi info.<br>By selecting this option you accept the <a href='%1'>Nokia HERE terms and conditions</a>.").arg("here-terms.qml"),
                             key: "here"
                         });
                     }