[Android] Split the next string in two for different translations

Nicolas Pomepuy git at videolan.org
Thu Mar 24 17:27:51 UTC 2022


vlc-android | branch: master | Nicolas Pomepuy <nicolas at videolabs.io> | Thu Mar 24 15:40:38 2022 +0100| [c200c9d3823cbc298d01e770047959e9df2a1502] | committer: Nicolas Pomepuy

Split the next string in two for different translations

Fixes #2449

> https://code.videolan.org/videolan/vlc-android/commit/c200c9d3823cbc298d01e770047959e9df2a1502
---

 application/resources/src/main/res/values/strings.xml                   | 1 +
 application/vlc-android/res/layout-land/onboarding_no_permission.xml    | 2 +-
 application/vlc-android/res/layout-land/onboarding_permission.xml       | 2 +-
 application/vlc-android/res/layout-land/onboarding_scanning.xml         | 2 +-
 application/vlc-android/res/layout/audio_player_tips.xml                | 2 +-
 application/vlc-android/res/layout/audio_playlist_tips.xml              | 2 +-
 application/vlc-android/res/layout/onboarding_no_permission.xml         | 2 +-
 application/vlc-android/res/layout/onboarding_permission.xml            | 2 +-
 application/vlc-android/res/layout/onboarding_scanning.xml              | 2 +-
 application/vlc-android/res/layout/player_tips.xml                      | 2 +-
 .../src/org/videolan/vlc/gui/audio/AudioPlaylistTipsDelegate.kt         | 2 +-
 .../vlc-android/src/org/videolan/vlc/gui/audio/AudioTipsDelegate.kt     | 2 +-
 .../vlc-android/src/org/videolan/vlc/gui/video/VideoTipsDelegate.kt     | 2 +-
 13 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/application/resources/src/main/res/values/strings.xml b/application/resources/src/main/res/values/strings.xml
index a5461ce31..9afa2ff33 100644
--- a/application/resources/src/main/res/values/strings.xml
+++ b/application/resources/src/main/res/values/strings.xml
@@ -651,6 +651,7 @@
     <string name="delete_the_selected">Delete selection</string>
     <string name="download_the_selected">Download selection</string>
     <string name="next">Next</string>
+    <string name="next_step">Next</string>
     <string name="download">Download</string>
     <string name="ctx_player_video_track">Select video track</string>
     <string name="ctx_player_audio_track">Audio track</string>
diff --git a/application/vlc-android/res/layout-land/onboarding_no_permission.xml b/application/vlc-android/res/layout-land/onboarding_no_permission.xml
index dde2057c6..6960e46f1 100644
--- a/application/vlc-android/res/layout-land/onboarding_no_permission.xml
+++ b/application/vlc-android/res/layout-land/onboarding_no_permission.xml
@@ -50,7 +50,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
-            android:text="@string/next"
+            android:text="@string/next_step"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.5"
diff --git a/application/vlc-android/res/layout-land/onboarding_permission.xml b/application/vlc-android/res/layout-land/onboarding_permission.xml
index dc5a94927..b3fad4677 100644
--- a/application/vlc-android/res/layout-land/onboarding_permission.xml
+++ b/application/vlc-android/res/layout-land/onboarding_permission.xml
@@ -111,7 +111,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="24dp"
-            android:text="@string/next"
+            android:text="@string/next_step"
             android:visibility="gone"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/application/vlc-android/res/layout-land/onboarding_scanning.xml b/application/vlc-android/res/layout-land/onboarding_scanning.xml
index 718fafdc1..988beab36 100644
--- a/application/vlc-android/res/layout-land/onboarding_scanning.xml
+++ b/application/vlc-android/res/layout-land/onboarding_scanning.xml
@@ -128,7 +128,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
-            android:text="@string/next"
+            android:text="@string/next_step"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.5"
diff --git a/application/vlc-android/res/layout/audio_player_tips.xml b/application/vlc-android/res/layout/audio_player_tips.xml
index b12546494..e946a58ba 100644
--- a/application/vlc-android/res/layout/audio_player_tips.xml
+++ b/application/vlc-android/res/layout/audio_player_tips.xml
@@ -103,7 +103,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:onClick="onClickNextTips"
-            android:text="@string/next"
+            android:text="@string/next_step"
             app:layout_constraintBottom_toBottomOf="@+id/audio_tips_background"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.5"
diff --git a/application/vlc-android/res/layout/audio_playlist_tips.xml b/application/vlc-android/res/layout/audio_playlist_tips.xml
index 5cadb4dad..83d8efd20 100644
--- a/application/vlc-android/res/layout/audio_playlist_tips.xml
+++ b/application/vlc-android/res/layout/audio_playlist_tips.xml
@@ -125,7 +125,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
             android:onClick="onClickNextPlaylistTips"
-            android:text="@string/next"
+            android:text="@string/next_step"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/helpDescription" />
diff --git a/application/vlc-android/res/layout/onboarding_no_permission.xml b/application/vlc-android/res/layout/onboarding_no_permission.xml
index b6b3122ce..04adbaa9c 100644
--- a/application/vlc-android/res/layout/onboarding_no_permission.xml
+++ b/application/vlc-android/res/layout/onboarding_no_permission.xml
@@ -92,7 +92,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
-            android:text="@string/next"
+            android:text="@string/next_step"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.5"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/application/vlc-android/res/layout/onboarding_permission.xml b/application/vlc-android/res/layout/onboarding_permission.xml
index b0d28d78c..0a0bb8d60 100644
--- a/application/vlc-android/res/layout/onboarding_permission.xml
+++ b/application/vlc-android/res/layout/onboarding_permission.xml
@@ -102,7 +102,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="24dp"
-            android:text="@string/next"
+            android:text="@string/next_step"
             android:visibility="gone"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.5"
diff --git a/application/vlc-android/res/layout/onboarding_scanning.xml b/application/vlc-android/res/layout/onboarding_scanning.xml
index e932a3b78..903788d9e 100644
--- a/application/vlc-android/res/layout/onboarding_scanning.xml
+++ b/application/vlc-android/res/layout/onboarding_scanning.xml
@@ -93,7 +93,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
-            android:text="@string/next"
+            android:text="@string/next_step"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.5"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/application/vlc-android/res/layout/player_tips.xml b/application/vlc-android/res/layout/player_tips.xml
index 36e822a6c..8873d4bbf 100644
--- a/application/vlc-android/res/layout/player_tips.xml
+++ b/application/vlc-android/res/layout/player_tips.xml
@@ -87,7 +87,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:onClick="onClickNextTips"
-            android:text="@string/next"
+            android:text="@string/next_step"
             app:layout_constraintBottom_toTopOf="@+id/tips_overlay_play"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/application/vlc-android/src/org/videolan/vlc/gui/audio/AudioPlaylistTipsDelegate.kt b/application/vlc-android/src/org/videolan/vlc/gui/audio/AudioPlaylistTipsDelegate.kt
index c8b6f2d7d..25ed577bc 100644
--- a/application/vlc-android/src/org/videolan/vlc/gui/audio/AudioPlaylistTipsDelegate.kt
+++ b/application/vlc-android/src/org/videolan/vlc/gui/audio/AudioPlaylistTipsDelegate.kt
@@ -273,7 +273,7 @@ class AudioPlaylistTipsDelegate(private val activity: AudioPlayerContainerActivi
 
 
         clearAllAnimations()
-        nextButton.setText(R.string.next)
+        nextButton.setText(R.string.next_step)
 
         when (currentTip) {
             AudioPlaylistTipsStep.REMOVE -> {
diff --git a/application/vlc-android/src/org/videolan/vlc/gui/audio/AudioTipsDelegate.kt b/application/vlc-android/src/org/videolan/vlc/gui/audio/AudioTipsDelegate.kt
index bfa6fae2e..17b424352 100644
--- a/application/vlc-android/src/org/videolan/vlc/gui/audio/AudioTipsDelegate.kt
+++ b/application/vlc-android/src/org/videolan/vlc/gui/audio/AudioTipsDelegate.kt
@@ -117,7 +117,7 @@ class AudioTipsDelegate(private val activity: AudioPlayerContainerActivity) {
 
 
         clearAllAnimations()
-        nextButton.setText(R.string.next)
+        nextButton.setText(R.string.next_step)
 
         when (currentTip) {
             AudioPlayerTipsStep.SWIPE_NEXT -> {
diff --git a/application/vlc-android/src/org/videolan/vlc/gui/video/VideoTipsDelegate.kt b/application/vlc-android/src/org/videolan/vlc/gui/video/VideoTipsDelegate.kt
index bc01a3d2d..a9cf28b06 100644
--- a/application/vlc-android/src/org/videolan/vlc/gui/video/VideoTipsDelegate.kt
+++ b/application/vlc-android/src/org/videolan/vlc/gui/video/VideoTipsDelegate.kt
@@ -235,7 +235,7 @@ class VideoTipsDelegate(private val player: VideoPlayerActivity) : OnClickListen
         getTapIndicators().forEach { constraintSet.setVisibility(it.id, GONE) }
 
         clearAllAnimations()
-        nextButton.setText(R.string.next)
+        nextButton.setText(R.string.next_step)
 
         when (currentTip) {
             VideoPlayerTipsStep.CONTROLS -> {



More information about the Android mailing list