From 168c98dc4765eff3865f38b1a9ef364d7504824d Mon Sep 17 00:00:00 2001
From: jainv4156 <123441149+jainv4156@users.noreply.github.com>
Date: Mon, 4 Nov 2024 17:15:42 +0530
Subject: [PATCH] =?UTF-8?q?Fixes=20#5484:=20Multiple=20substitutions=20spe?=
 =?UTF-8?q?cified=20in=20non-positional=20format=20of=20st=E2=80=A6=20(#55?=
 =?UTF-8?q?60)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Explanation
Fixes : #5484

Some string resources have multiple %s . To fix the error, we must
identify each string position with a number : %1$s

## Essential Checklist
<!-- Please tick the relevant boxes by putting an "x" in them. -->
- [x] The PR title and explanation each start with "Fix #bugnum: " (If
this PR fixes part of an issue, prefix the title with "Fix part of
#bugnum: ...".)
- [x] Any changes to
[scripts/assets](https://github.com/oppia/oppia-android/tree/develop/scripts/assets)
files have their rationale included in the PR explanation.
- [x] The PR follows the [style
guide](https://github.com/oppia/oppia-android/wiki/Coding-style-guide).
- [x] The PR does not contain any unnecessary code changes from Android
Studio
([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#undo-unnecessary-changes)).
- [x] The PR is made from a branch that's **not** called "develop" and
is up-to-date with "develop".
- [x] The PR is **assigned** to the appropriate reviewers
([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#clarification-regarding-assignees-and-reviewers-section)).

---------

Co-authored-by: Adhiambo Peres <59600948+adhiamboperes@users.noreply.github.com>
---
 app/src/main/res/values/strings.xml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a1b7ad23201..0c43c5e2c26 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -92,11 +92,11 @@
   <string name="ongoing_topic_list_activity_title">Topics in Progress</string>
   <string name="topic_story_progress_percentage">%s\%%</string>
   <string name="topic_play_chapter_index">%s</string>
-  <string name="chapter_name">Chapter %s: %s</string>
-  <string name="chapter_completed">Chapter %s with title %s is completed</string>
-  <string name="chapter_in_progress">Chapter %s with title %s is in progress</string>
-  <string name="chapter_prerequisite_title_label">Complete Chapter %s: %s to unlock this chapter.</string>
-  <string name="chapter_locked_prerequisite_title_label">Chapter %s: %s is currently locked. Please complete chapter %s: %s to unlock this chapter.</string>
+  <string name="chapter_name">Chapter %1$s: %2$s</string>
+  <string name="chapter_completed">Chapter %1$s with title %2$s is completed</string>
+  <string name="chapter_in_progress">Chapter %1$s with title %2$s is in progress</string>
+  <string name="chapter_prerequisite_title_label">Complete Chapter %1$s: %2$s to unlock this chapter.</string>
+  <string name="chapter_locked_prerequisite_title_label">Chapter %1$s: %2$s is currently locked. Please complete chapter %3$s: %4$s to unlock this chapter.</string>
   <string name="chapter_prerequisite_title_label_without_chapter_title">Complete the previous chapter to unlock this chapter.</string>
   <string name="text_input_default_content_description">Enter text.</string>
   <string name="fractions_default_hint_text">Enter a fraction in the form x/x, or a mixed number in the form x x/x.</string>
@@ -154,7 +154,7 @@
   <string name="topic_downloaded">Topic Downloaded</string>
   <string name="downloaded">Downloaded</string>
   <string name="question_player_title">Practice Mode</string>
-  <string name="question_training_session_progress">Question %s of %s</string>
+  <string name="question_training_session_progress">Question %1$s of %2$s</string>
   <string name="question_training_session_progress_finished">Complete</string>
   <string name="question_training_session_finished_header">Finished</string>
   <string name="question_training_session_finished_message">You have finished all of the questions! You can choose to play another set of questions, or return to the topic.</string>
@@ -190,7 +190,7 @@
   <string name="size_gb">%s GB</string>
   <string name="correct">Correct!</string>
   <string name="topic_prefix">Topic: %s</string>
-  <string name="welcome_profile_name">%s %s!</string>
+  <string name="welcome_profile_name">%1$s %2$s!</string>
   <plurals name="chapter_count">
     <item quantity="one">1 Chapter</item>
     <item quantity="other">%s Chapters</item>
@@ -200,8 +200,8 @@
     <item quantity="other">%s Stories</item>
   </plurals>
   <plurals name="story_total_chapters">
-    <item quantity="one">%s of %s Chapter Completed</item>
-    <item quantity="other">%s of %s Chapters Completed</item>
+    <item quantity="one">%1$s of %2$s Chapter Completed</item>
+    <item quantity="other">%1$s of %2$s Chapters Completed</item>
   </plurals>
   <plurals name="lesson_count">
     <item quantity="one">1 Lesson</item>
@@ -280,7 +280,7 @@
   <string name="skip">Skip</string>
   <string name="next_arrow">Next</string>
   <string name="get_started">Get Started</string>
-  <string name="onboarding_slide_dots_content_description">Slide %s of %s</string>
+  <string name="onboarding_slide_dots_content_description">Slide %1$s of %2$s</string>
   <!-- PinPasswordActivity -->
   <string name="pin_password_hello">Hi, %s!</string>
   <string name="pin_password_admin_enter">Please enter your Administrator PIN.</string>
@@ -465,7 +465,7 @@
   <string name="move_item_up_content_description">Move item up to %s</string>
   <string name="up_button_disabled">Up</string>
   <string name="down_button_disabled">Down</string>
-  <string name="profile_last_visited">%s %s</string>
+  <string name="profile_last_visited">%1$s %2$s</string>
   <plurals name="minutes_ago">
     <item quantity="one">a minute ago</item>
     <item quantity="other">%s minutes ago</item>