Skip to content

Commit

Permalink
Merge strings.
Browse files Browse the repository at this point in the history
  • Loading branch information
dbrant committed Jan 24, 2025
1 parent adb6719 commit 96480e1
Show file tree
Hide file tree
Showing 4 changed files with 41 additions and 79 deletions.
5 changes: 0 additions & 5 deletions app/src/main/java/org/wikipedia/page/PageFragment.kt
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,8 @@ import android.webkit.WebResourceRequest
import android.webkit.WebResourceResponse
import android.webkit.WebView
import android.widget.Button
import android.widget.CheckBox
import android.widget.ImageView
import android.widget.LinearLayout
import android.widget.TextView
import androidx.appcompat.app.AppCompatActivity
import androidx.coordinatorlayout.widget.CoordinatorLayout
import androidx.core.animation.doOnEnd
Expand Down Expand Up @@ -703,14 +701,11 @@ class PageFragment : Fragment(), BackPressedHandler, CommunicationBridge.Communi
val dialog = MaterialAlertDialogBuilder(requireActivity())
.setView(dialogView)
.show()
dialogView.findViewById<TextView>(R.id.dialogDescription).text = getString(R.string.on_this_day_game_dialog_description, OnThisDayGameViewModel.daysLeft)
dialogView.findViewById<Button>(R.id.playGameButton).setOnClickListener {
startActivity(OnThisDayGameActivity.newIntent(requireContext(), InvokeSource.PAGE_ACTIVITY))
Prefs.isOtdGameDialogEnabled = !dialogView.findViewById<CheckBox>(R.id.disableCheckBox).isChecked
dialog.dismiss()
}
dialogView.findViewById<ImageView>(R.id.closeButton).setOnClickListener {
Prefs.isOtdGameDialogEnabled = !dialogView.findViewById<CheckBox>(R.id.disableCheckBox).isChecked
dialog.dismiss()
}
}
Expand Down
11 changes: 1 addition & 10 deletions app/src/main/res/layout/dialog_on_this_day_game.xml
Original file line number Diff line number Diff line change
Expand Up @@ -49,20 +49,11 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="?attr/placeholder_color"
android:text="@string/on_this_day_game_dialog_description"
android:text="@string/on_this_day_game_splash_message"
android:layout_marginVertical="16dp"
android:layout_marginHorizontal="12dp"
android:textAlignment="center"/>

<com.google.android.material.checkbox.MaterialCheckBox
style="@style/H3.Button"
android:id="@+id/disableCheckBox"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="?attr/placeholder_color"
android:text="@string/on_this_day_game_dialog_dismiss"
app:buttonTint="?attr/progressive_color"/>

</LinearLayout>

</ScrollView>
Expand Down
49 changes: 20 additions & 29 deletions app/src/main/res/values-qq/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1694,35 +1694,6 @@
<string name="places_toggle_buttons_map">Button label for viewing the map view in the Places screen.</string>
<string name="places_toggle_buttons_list">Button label for viewing the list view in the Places screen.</string>
<string name="places_empty_list">Empty message for the list in the current map area. Please keep the anchor link around the \"on the map\".</string>
<string name="on_this_day_game_title">Title for the trivia game dialog.</string>
<string name="on_this_day_game_dialog_description">Message for the trivia game dialog. The %d symbol will be replaced by the number of remaining days.</string>
<string name="on_this_day_game_dialog_button">Button label for the trivia game dialog to enter the trivia game.</string>
<string name="on_this_day_game_dialog_dismiss">Button label for the trivia game dialog to dismiss the dialog.</string>
<string name="on_this_day_game_experiment_chip_text">Chip label for the game menu item in the more menu.</string>
<string name="on_this_day_game_splash_message">Message for the splash screen to explain the game rules.</string>
<string name="on_this_day_game_splash_message_2">Message for the splash screen to explain the game details. %1$d will be replaced by the number of questions per day, and %2$d is the total days for which the game will be available.</string>
<string name="on_this_day_game_nav_title">Menu label for accessing the Games feature.</string>
<string name="on_this_day_game_submit">Button label for submitting the current answer.</string>
<string name="on_this_day_game_next">Button label for navigating to the next question.</string>
<string name="on_this_day_game_finish">Button label for finishing the game.</string>
<string name="on_this_day_game_share">Button label for sharing game results.</string>
<string name="on_this_day_game_result">Message shown at the end of a game. The %1$d symbol is replaced with the number of correct answers, %2$d is the total number of questions, and %3$s is a message of encouragement to try again.</string>
<string name="on_this_day_game_result_subtitle">Label shown over the list of articles mentioned in the game.</string>
<string name="on_this_day_game_encourage0">Message of encouragement for a low game score.</string>
<string name="on_this_day_game_encourage1">Message of encouragement for a medium game score.</string>
<string name="on_this_day_game_encourage2">Message of encouragement for a high game score.</string>
<string name="on_this_day_game_encourage3">Message of encouragement for a perfect game score.</string>
<string name="on_this_day_game_next_in">Message indicating the time left until the next game. %s is replaced by the time.</string>
<string name="on_this_day_game_your_activity">Title on top of your statistics from previous days of gameplay.</string>
<string name="on_this_day_game_week_from_to">Label for weekly statistics. %1$s represents the starting day of the week, and %2$s is the ending day of the week.</string>
<plurals name="on_this_day_game_streak">
<item quantity="one">Current streak of daily gameplay. %d is the number of consecutive days.</item>
<item quantity="other">Current streak of daily gameplay. %d is the number of consecutive days.</item>
</plurals>
<string name="on_this_day_game_share_title">Title of the share screen of the game. The %1$d will be replaced by the corrected number, and the %2$d will be replaced by the total number of questions.</string>
<string name="on_this_day_game_share_subtitle">Subtitle of the share screen of the game.</string>
<string name="on_this_day_game_share_footer">Footer text of the share screen of the game.</string>
<string name="on_this_day_game_share_back_button">Buttle label for going back to the final game page.</string>
<string name="places_card_title">Title for the Places card on the explore feed.</string>
<string name="places_card_action">Text for the Places card action on the explore feed</string>
<string name="places_card_enable_location_card_message">Message for the Places card on the explore feed that requires enable location permission.</string>
Expand Down Expand Up @@ -1755,4 +1726,24 @@
<string name="on_this_day_game_correct">Message shown when a correct answer is given.</string>
<string name="on_this_day_game_incorrect">Message shown when a incorrect answer is given.</string>
<string name="on_this_day_game_point">Indication of points earned with a correct response. (always 1 point, not plural)</string>
<string name="on_this_day_game_experiment_chip_text">Chip label for the game menu item in the more menu.</string>
<string name="on_this_day_game_nav_title">Menu label for accessing the Games feature.</string>
<string name="on_this_day_game_share">Button label for sharing game results.</string>
<string name="on_this_day_game_result">Message shown at the end of a game. The %1$d symbol is replaced with the number of correct answers, %2$d is the total number of questions, and %3$s is a message of encouragement to try again.</string>
<string name="on_this_day_game_result_subtitle">Label shown over the list of articles mentioned in the game.</string>
<string name="on_this_day_game_encourage0">Message of encouragement for a low game score.</string>
<string name="on_this_day_game_encourage1">Message of encouragement for a medium game score.</string>
<string name="on_this_day_game_encourage2">Message of encouragement for a high game score.</string>
<string name="on_this_day_game_encourage3">Message of encouragement for a perfect game score.</string>
<string name="on_this_day_game_next_in">Message indicating the time left until the next game. %s is replaced by the time.</string>
<string name="on_this_day_game_your_activity">Title on top of your statistics from previous days of gameplay.</string>
<string name="on_this_day_game_week_from_to">Label for weekly statistics. %1$s represents the starting day of the week, and %2$s is the ending day of the week.</string>
<plurals name="on_this_day_game_streak">
<item quantity="one">Current streak of daily gameplay. %d is the number of consecutive days.</item>
<item quantity="other">Current streak of daily gameplay. %d is the number of consecutive days.</item>
</plurals>
<string name="on_this_day_game_share_title">Title of the share screen of the game. The %1$d will be replaced by the corrected number, and the %2$d will be replaced by the total number of questions.</string>
<string name="on_this_day_game_share_subtitle">Subtitle of the share screen of the game.</string>
<string name="on_this_day_game_share_footer">Footer text of the share screen of the game.</string>
<string name="on_this_day_game_share_back_button">Buttle label for going back to the final game page.</string>
</resources>
55 changes: 20 additions & 35 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1780,41 +1780,6 @@
<string name="places_empty_message_snackbar">There are no nearby articles. Try zooming out and moving the map.</string>
<!-- /Places -->

<string name="on_this_day_game_title">Which came first?</string>
<string name="on_this_day_game_dialog_description">Limited time only: WikiDate Detective is a beta experiment that will be available for %d more days</string>
<string name="on_this_day_game_dialog_button">Start playing</string>
<string name="on_this_day_game_dialog_dismiss">Don\'t show alert again</string>
<string name="on_this_day_game_splash_message">Decide which event on this day happened first.</string>
<string name="on_this_day_game_splash_message_2">%1$d questions per game\n\nNew game daily for %2$d days</string>
<string name="on_this_day_game_progress">%1$d of %2$d</string>
<string name="on_this_day_game_score">Score: %d</string>
<string name="on_this_day_game_correct">Correct!</string>
<string name="on_this_day_game_incorrect">Incorrect!</string>
<string name="on_this_day_game_point">+1 point</string>
<string name="on_this_day_game_experiment_chip_text">Experiment</string>
<string name="on_this_day_game_nav_title">Games</string>
<string name="on_this_day_game_submit">Submit</string>
<string name="on_this_day_game_next">Next question</string>
<string name="on_this_day_game_finish">Finish</string>
<string name="on_this_day_game_share">Share with friends</string>
<string name="on_this_day_game_result">You got %1$d out of %2$d questions right today. %3$s</string>
<string name="on_this_day_game_result_subtitle">Articles mentioned in today\'s game</string>
<string name="on_this_day_game_encourage0">Better luck tomorrow!</string>
<string name="on_this_day_game_encourage1">Congratulations!</string>
<string name="on_this_day_game_encourage2">Great job!</string>
<string name="on_this_day_game_encourage3">Excellent!</string>
<string name="on_this_day_game_next_in">Next game in %s</string>
<string name="on_this_day_game_your_activity">Your activity</string>
<string name="on_this_day_game_week_from_to">%1$s–%2$s</string>
<plurals name="on_this_day_game_streak">
<item quantity="one"><![CDATA[Playing streak: <b>%d day</b>]]></item>
<item quantity="other"><![CDATA[Playing streak: <b>%d days</b>]]></item>
</plurals>
<string name="on_this_day_game_share_title">I scored %1$d out of %2$d on WikiDate Detective today</string>
<string name="on_this_day_game_share_subtitle">Topics included:</string>
<string name="on_this_day_game_share_footer">Play for a limited time only in the Wikipedia Android app</string>
<string name="on_this_day_game_share_back_button">Go back</string>

<!-- Survey dialog -->
<string name="survey_dialog_title">Help us improve this feature</string>
<string name="survey_dialog_message">Are you satisfied with this feature?</string>
Expand Down Expand Up @@ -1843,5 +1808,25 @@
<string name="on_this_day_game_point">+1 point</string>
<string name="on_this_day_game_next">Next question</string>
<string name="on_this_day_game_finish">Final results</string>
<string name="on_this_day_game_experiment_chip_text">Experiment</string>
<string name="on_this_day_game_nav_title">Games</string>
<string name="on_this_day_game_share">Share with friends</string>
<string name="on_this_day_game_result">You got %1$d out of %2$d questions right today. %3$s</string>
<string name="on_this_day_game_result_subtitle">Articles mentioned in today\'s game</string>
<string name="on_this_day_game_encourage0">Better luck tomorrow!</string>
<string name="on_this_day_game_encourage1">Congratulations!</string>
<string name="on_this_day_game_encourage2">Great job!</string>
<string name="on_this_day_game_encourage3">Excellent!</string>
<string name="on_this_day_game_next_in">Next game in %s</string>
<string name="on_this_day_game_your_activity">Your activity</string>
<string name="on_this_day_game_week_from_to">%1$s–%2$s</string>
<plurals name="on_this_day_game_streak">
<item quantity="one"><![CDATA[Playing streak: <b>%d day</b>]]></item>
<item quantity="other"><![CDATA[Playing streak: <b>%d days</b>]]></item>
</plurals>
<string name="on_this_day_game_share_title">I scored %1$d out of %2$d on WikiDate Detective today</string>
<string name="on_this_day_game_share_subtitle">Topics included:</string>
<string name="on_this_day_game_share_footer">Play for a limited time only in the Wikipedia Android app</string>
<string name="on_this_day_game_share_back_button">Go back</string>

</resources>

0 comments on commit 96480e1

Please sign in to comment.