Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eecc97a3 authored by Jeremy Goldman's avatar Jeremy Goldman
Browse files

Add additional strings to differentiate between single and multiple 

insecure vpns

Although in english, the strings can be "N not secure", in other
languages translators have requested that we add "VPN" or "VPNs" after
the number for extra clarity. Thus, we split the string into two
depending on whether there is just one or more than one insecure VPN.

Bug: 184167494
Test: atest -c SettingsUnitTests
Change-Id: I93f0cbec5f22ffcac70ddc2ecf640729eef29c04
parent 88ee31e2

res/values/strings.xml

+4 −2
Original line number Diff line number Diff line
@@ -6508,8 +6508,10 @@ 
    <string name="vpn_settings_title">VPN</string>

    <!-- Title of preference to enter the VPN settings activity [CHAR LIMIT=30] -->

    <string name="vpn_settings_insecure_single">Not secure</string>

    <!-- Title of preference to enter the VPN settings activity [CHAR LIMIT=30] -->

    <string name="vpn_settings_insecure_multiple"><xliff:g id="vpn_count" example="1">%d</xliff:g> not secure</string>

    <!-- Title of preference to enter the VPN settings activity, if there are multiple vpns but only 1 insecure vpn [CHAR LIMIT=60] -->

    <string name="vpn_settings_single_insecure_multiple_total"><xliff:g id="vpn_count" example="1">%d</xliff:g> not secure</string>

    <!-- Title of preference to enter the VPN settings activity, if there are multiple vpns and multiple insecure vpns [CHAR LIMIT=60] -->

    <string name="vpn_settings_multiple_insecure_multiple_total"><xliff:g id="vpn_count" example="1">%d</xliff:g> not secure</string>









    <!-- Title of Adaptive connectivity. Adaptive connectivity is a feature which automatically manages network connections for better battery life and performance. [CHAR LIMIT=60] -->









    <string name="adaptive_connectivity_title">Adaptive connectivity</string>

























src/com/android/settings/network/VpnPreferenceController.java



+6
−1






























Original line number
Diff line number
Diff line







@@ -169,9 +169,14 @@ public class VpnPreferenceController extends AbstractPreferenceController







                        - connectedLegacyVpnCount;









                if (vpnCount == 1) {









                    summary = mContext.getString(R.string.vpn_settings_insecure_single);









                } else if (insecureVpnCount == 1) {









                    summary = mContext.getString(









                            R.string.vpn_settings_single_insecure_multiple_total,









                            insecureVpnCount);









                } else {









                    summary = mContext.getString(









                            R.string.vpn_settings_insecure_multiple, insecureVpnCount);









                            R.string.vpn_settings_multiple_insecure_multiple_total,









                            insecureVpnCount);









                }









            }









        }