diff options
| author |   Jason A. Donenfeld <Jason@zx2c4.com> | 2018-07-05 21:34:50 +0200 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2018-07-06 16:28:46 +0200 |
| commit | f10403f457eba929b3e9a1f2947314cd7bb51146 (patch) | |
| tree | cb23beeb6a7ccdad75eeb0c56b5317ef9aa18d58 /app/src/main/res | |
| parent | AppListDialogFragment: add implementation for excluding applications (diff) | |
| download | wireguard-android-f10403f457eba929b3e9a1f2947314cd7bb51146.tar.xz wireguard-android-f10403f457eba929b3e9a1f2947314cd7bb51146.zip | |
TunnelEditor: fix nits
Diffstat (limited to 'app/src/main/res')
| -rw-r--r-- | app/src/main/res/layout/tunnel_editor_fragment.xml | 3 | ||||
| -rw-r--r-- | app/src/main/res/values/strings.xml | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/app/src/main/res/layout/tunnel_editor_fragment.xml b/app/src/main/res/layout/tunnel_editor_fragment.xml index cbdc46cf..5a2bfe34 100644 --- a/app/src/main/res/layout/tunnel_editor_fragment.xml +++ b/app/src/main/res/layout/tunnel_editor_fragment.xml @@ -218,12 +218,13 @@ <Button style="@style/Widget.AppCompat.Button.Borderless.Colored" + android:id="@+id/set_excluded_applications" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="-8dp" android:layout_below="@+id/dns_servers_text" android:onClick="@{fragment::onRequestSetExcludedApplications}" - android:text="@{fragment.excludedApplications().length == 0 ? @string/set_excluded_applications : String.format(@string/x_excluded_applications, fragment.excludedApplications().length)}" /> + android:text="@{@plurals/set_excluded_applications(config.interfaceSection.excludedApplicationsCount, config.interfaceSection.excludedApplicationsCount)}" /> </RelativeLayout> </android.support.v7.widget.CardView> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 082a7477..b44e3121 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -69,7 +69,10 @@ <string name="restore_on_boot_summary">Bring up previously-enabled tunnels on boot</string> <string name="restore_on_boot_title">Restore on boot</string> <string name="save">Save</string> - <string name="set_excluded_applications">Set Excluded Applications</string> + <plurals name="set_excluded_applications"> + <item quantity="one">%d Excluded Application</item> + <item quantity="other">%d Excluded Applications</item> + </plurals> <string name="set_exclusions">Set Exclusions</string> <string name="settings">Settings</string> <string name="toggle_error">Error toggling WireGuard tunnel: %s</string> |