Skip to content

Commit 8f98ac0

Browse files
92lleo92lleo
committed
Fix string resources and de translation
1 parent 72b4ffc commit 8f98ac0

File tree

9 files changed

+50
-37
lines changed

9 files changed

+50
-37
lines changed

‎app/src/main/java/io/kuenzler/whatsappwebtogo/WebviewActivity.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -475,7 +475,7 @@ private void showVersionInfo() {
475475
return;
476476
}
477477
if (lastShownVersionCode < currentVersionCode) {
478-
showPopupDialog(R.string.versionInfo);
478+
showPopupDialog(R.string.versionInfoText);
479479
} else {
480480
return;
481481
}
@@ -484,15 +484,15 @@ private void showVersionInfo() {
484484

485485
private void showIntroInfo() {
486486
if (!mSharedPrefs.getBoolean("introShown", false)) {
487-
showPopupDialog(R.string.introInfo);
487+
showPopupDialog(R.string.introInfoText);
488488
} else {
489489
return;
490490
}
491491
mSharedPrefs.edit().putBoolean("introShown", true).apply();
492492
}
493493

494494
private void showAbout() {
495-
showPopupDialog(R.string.about);
495+
showPopupDialog(R.string.aboutText);
496496
}
497497

498498
@Override

‎app/src/main/res/layout/app_bar_main.xml

-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
android:layout_height="?attr/actionBarSize"
1818
android:background="?attr/colorPrimary"
1919
app:popupTheme="@style/AppTheme.PopupOverlay" />
20-
2120
</com.google.android.material.appbar.AppBarLayout>
2221

2322
<include layout="@layout/content_main" />

‎app/src/main/res/layout/content_main.xml

+3-6
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,10 @@
1212
<WebView
1313
android:id="@+id/webview"
1414
android:layout_width="fill_parent"
15-
android:layout_height="fill_parent"
16-
android:layout_marginEnd="0dp"
17-
android:layout_marginLeft="0dp"
18-
android:layout_marginRight="0dp"
19-
android:layout_marginStart="0dp"
15+
android:layout_height="0dp"
2016
android:windowSoftInputMode="adjustResize"
17+
app:layout_constraintBottom_toBottomOf="parent"
2118
app:layout_constraintEnd_toEndOf="parent"
22-
app:layout_constraintHorizontal_bias="0.0" />
19+
app:layout_constraintTop_toTopOf="parent" />
2320

2421
</androidx.constraintlayout.widget.ConstraintLayout>

‎app/src/main/res/layout/nav_header_main.xml

+2-3
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,12 @@
2323
android:layout_width="match_parent"
2424
android:layout_height="wrap_content"
2525
android:paddingTop="@dimen/nav_header_vertical_spacing"
26-
android:text="WhatsApp Web To Go"
26+
android:text="@string/app_name"
2727
android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
2828

2929
<TextView
3030
android:id="@+id/textView"
3131
android:layout_width="wrap_content"
3232
android:layout_height="wrap_content"
33-
android:text="1.6.0" />
34-
33+
android:text="@string/appversion_semantic" />
3534
</LinearLayout>

‎app/src/main/res/menu/action_bar.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,22 @@
77
android:enabled="false"
88
android:icon="@drawable/ic_scroll_left"
99
android:orderInCategory="100"
10-
android:title="Scroll left"
10+
android:title="@string/appbar_button_scroll_left"
1111
android:visible="false"
1212
app:showAsAction="always" />
1313
<item
1414
android:id="@+id/scroll_right"
1515
android:enabled="false"
1616
android:icon="@drawable/ic_scroll_right"
1717
android:orderInCategory="100"
18-
android:title="Scroll right"
18+
android:title="@string/appbar_title_scroll_right"
1919
android:visible="false"
2020
app:showAsAction="always" />
2121
<item
2222
android:id="@+id/toggle_keyboard"
2323
android:icon="@drawable/ic_toggle_keyboard"
2424
android:orderInCategory="100"
25-
android:title="Toggle keyboard"
25+
android:title="@string/appbar_button_toggle_keyboard"
2626
android:visible="true"
2727
app:showAsAction="always" />
2828
</menu>

‎app/src/main/res/menu/activity_main_drawer.xml

+9-9
Original file line numberDiff line numberDiff line change
@@ -7,46 +7,46 @@
77
<item
88
android:id="@+id/nav_logout"
99
android:icon="@android:drawable/ic_menu_close_clear_cancel"
10-
android:title="Logout" />
10+
android:title="@string/sidebar_button_logout" />
1111
<item
1212
android:id="@+id/nav_reload"
1313
android:icon="@android:drawable/stat_notify_sync"
14-
android:title="Reload" />
14+
android:title="@string/sidebar_button_reload" />
1515
<item
1616
android:id="@+id/nav_new"
1717
android:enabled="false"
1818
android:icon="@android:drawable/ic_menu_add"
19-
android:title="New Session"
19+
android:title="@string/sidebar_button_new_session"
2020
android:visible="false" />
2121
<item
2222
android:id="@+id/nav_switch"
2323
android:enabled="false"
2424
android:icon="@android:drawable/ic_menu_more"
25-
android:title="Switch Session"
25+
android:title="@string/sidebar_button_switch_session"
2626
android:visible="false" />
2727
<item
2828
android:id="@+id/appbar_hide"
2929
android:icon="@android:drawable/ic_menu_more"
30-
android:title="Toggle Appbar Visibility" />
30+
android:title="@string/sidebar_button_toggle_appbar_visibility" />
3131
<item
3232
android:id="@+id/nav_dark_mode"
3333
android:icon="@drawable/baseline_brightness_2_white_24"
34-
android:title="Toggle Dark Mode" />
34+
android:title="@string/sidebar_button_toggle_dark_mode" />
3535
<item
3636
android:id="@+id/nav_about"
3737
android:icon="@android:drawable/ic_dialog_info"
38-
android:title="About" />
38+
android:title="@string/sidebar_button_about" />
3939

4040
</group>
4141

4242

43-
<item android:title="Settings">
43+
<item android:title="@string/sidebar_title_settings">
4444
<menu>
4545
<item
4646
android:id="@+id/nav_settings"
4747
android:enabled="false"
4848
android:icon="@drawable/ic_menu_manage"
49-
android:title="Settings"
49+
android:title="@string/sidebar_button_settings"
5050
android:visible="false" />
5151
</menu>
5252
</item>

‎app/src/main/res/values-de/strings.xml

+12-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,17 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
3-
<string name="app_name">WhatsApp Web To Go</string>
4-
53
<string name="navigation_drawer_open">Navigation Drawer öffnen</string>
64
<string name="navigation_drawer_close">Navigation Drawer schließen</string>
7-
8-
<string name="action_settings">Einstellungen</string>
5+
<string name="sidebar_button_logout">Ausloggen</string>
6+
<string name="sidebar_button_reload">Neu laden</string>
7+
<string name="sidebar_button_new_session">Neue Session</string>
8+
<string name="sidebar_button_switch_session">Session wechseln</string>
9+
<string name="sidebar_button_toggle_appbar_visibility">Appbar umschalten</string>
10+
<string name="sidebar_button_toggle_dark_mode">Dark Mode umschalten</string>
11+
<string name="sidebar_button_about">Über</string>
12+
<string name="sidebar_title_settings">Einstellungen</string>
13+
<string name="sidebar_button_settings">@string/sidebar_title_settings</string>
14+
<string name="appbar_button_scroll_left">nach links scrollen</string>
15+
<string name="appbar_title_scroll_right">nach rechts scrollen</string>
16+
<string name="appbar_button_toggle_keyboard">Tastatur umschalten</string>
917
</resources>

‎app/src/main/res/values-v21/styles.xml

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<resources>
2-
32
<style name="AppTheme.NoActionBar">
43
<item name="windowActionBar">false</item>
54
<item name="windowNoTitle">true</item>

‎app/src/main/res/values/strings.xml

+18-7
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,23 @@
11
<resources>
2-
<string name="app_name">WhatsApp Web To Go</string>
2+
<string name="app_name" translatable="false">WhatsApp Web To Go</string>
3+
<string name="appversion_semantic" translatable="false">1.6.0</string>
4+
5+
<string name="versionInfoText">Thanks for updating!\nNew in version 1.6.0:\n&#8211;Fix Appbar visibility setting\n&#8211;Make links and mail clickable in about tab\n&#8211;Add experimental dark mode (thanks to @marcomariani094)</string>
6+
<string name="introInfoText">Thanks for installing!\nJust connect your phone as you would on your computer.\nTo lock and unlock the keyboard, use the keyboard button top right. Your settings will be saved.</string>
7+
<string name="aboutText">WhatsappWeb To Go\n\nby Leonhard Künzler\nBasetwo GbR\[email protected]\n\ngithub.com/92lleo/WhatsappWebToGo\n\n© 2017&#8211;2020\n\nv1.6.0\n\nThis app is in no way affiliated with WhatsApp Inc. The rights for WhatsApp and WhatsApp Web belong to WhatsApp Inc. This app is a private project to enable the use of WhatsApp Web on Android Devices</string>
38

49
<string name="navigation_drawer_open">Open navigation drawer</string>
510
<string name="navigation_drawer_close">Close navigation drawer</string>
6-
7-
<string name="action_settings">Settings</string>
8-
9-
<string name="versionInfo">Thanks for updating!\nNew in version 1.6.0:\n&#8211;Fix Appbar visibility setting\n&#8211;Make links and mail clickable in about tab\n&#8211;Add experimental dark mode (thanks to @marcomariani094)</string>
10-
<string name="introInfo">Thanks for installing!\nJust connect your phone as you would on your computer.\nTo lock and unlock the keyboard, use the keyboard button top right. Your settings will be saved.</string>
11-
<string name="about">WhatsappWeb To Go\n\nby Leonhard Künzler\nBasetwo GbR\[email protected]\n\ngithub.com/92lleo/WhatsappWebToGo\n\n© 2017&#8211;2020\n\nv1.6.0\n\nThis app is in no way affiliated with WhatsApp Inc. The rights for WhatsApp and WhatsApp Web belong to WhatsApp Inc. This app is a private project to enable the use of WhatsApp Web on Android Devices</string>
11+
<string name="sidebar_button_logout">Logout</string>
12+
<string name="sidebar_button_reload">Reload</string>
13+
<string name="sidebar_button_new_session">New Session</string>
14+
<string name="sidebar_button_switch_session">Switch Session</string>
15+
<string name="sidebar_button_toggle_appbar_visibility">Toggle Appbar Visibility</string>
16+
<string name="sidebar_button_toggle_dark_mode">Toggle Dark Mode</string>
17+
<string name="sidebar_button_about">About</string>
18+
<string name="sidebar_title_settings">Settings</string>
19+
<string name="sidebar_button_settings">@string/sidebar_title_settings</string>
20+
<string name="appbar_button_scroll_left">Scroll left</string>
21+
<string name="appbar_title_scroll_right">Scroll right</string>
22+
<string name="appbar_button_toggle_keyboard">Toggle keyboard</string>
1223
</resources>

0 commit comments

Comments
 (0)