From ae70d5b1111f6d072e38e8bfe5a6f8d211ae817e Mon Sep 17 00:00:00 2001
From: qwerty287 <qwerty287@noreply.codeberg.org>
Date: Wed, 23 Feb 2022 09:20:04 +0100
Subject: [PATCH] Update strings (#1045)

Use a %s instead of + to check CI

The resource key was changed to avoid issues with other languages if they do not have the %s in the string, they'll just use the English variant.

Co-authored-by: qwerty287 <ndev@web.de>
Reviewed-on: https://codeberg.org/gitnex/GitNex/pulls/1045
Reviewed-by: M M Arif <mmarif@noreply.codeberg.org>
Co-authored-by: qwerty287 <qwerty287@noreply.codeberg.org>
Co-committed-by: qwerty287 <qwerty287@noreply.codeberg.org>
---
 .../main/java/org/mian/gitnex/adapters/UserSearchAdapter.java   | 2 +-
 app/src/main/java/org/mian/gitnex/helpers/AlertDialogs.java     | 2 +-
 app/src/main/res/values/strings.xml                             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/org/mian/gitnex/adapters/UserSearchAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/UserSearchAdapter.java
index 921afd4f..ac368599 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/UserSearchAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/UserSearchAdapter.java
@@ -89,7 +89,7 @@ public class UserSearchAdapter extends RecyclerView.Adapter<UserSearchAdapter.Us
 
             addCollaboratorButtonRemove.setOnClickListener(v -> {
                 AlertDialogs.collaboratorRemoveDialog(context, userInfo.getUsername(),
-                        context.getResources().getString(R.string.removeCollaboratorTitle),
+                        context.getResources().getString(R.string.removeCollaboratorDialogTitle),
                         context.getResources().getString(R.string.removeCollaboratorMessage),
                         context.getResources().getString(R.string.removeButton),
                         context.getResources().getString(R.string.cancelButton), "fa");
diff --git a/app/src/main/java/org/mian/gitnex/helpers/AlertDialogs.java b/app/src/main/java/org/mian/gitnex/helpers/AlertDialogs.java
index f561336a..83b8426a 100644
--- a/app/src/main/java/org/mian/gitnex/helpers/AlertDialogs.java
+++ b/app/src/main/java/org/mian/gitnex/helpers/AlertDialogs.java
@@ -123,7 +123,7 @@ public class AlertDialogs {
     public static void collaboratorRemoveDialog(final Context context, final String userNameMain, String title, String message, String positiveButton, String negativeButton, final String searchKeyword) {
 
         new AlertDialog.Builder(context)
-                .setTitle(title + userNameMain)
+                .setTitle(String.format(title, userNameMain))
                 .setMessage(message)
                 .setPositiveButton(positiveButton, (dialog, whichButton) -> CollaboratorActions.deleteCollaborator(context,  searchKeyword, userNameMain))
                 .setNeutralButton(negativeButton, null).show();
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 066a774e..5151350d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -346,7 +346,7 @@
     <string name="addCollaboratorTitle">Add / Remove Collaborator</string>
     <string name="addCollaboratorSearchHint">Search users</string>
     <string name="addCollaboratorViewUserDesc">Username</string>
-    <string name="removeCollaboratorTitle">Remove\u0020</string>
+    <string name="removeCollaboratorDialogTitle">Remove %s?</string>
     <string name="removeCollaboratorMessage">Do you want to remove this user from the repository?</string>
     <string name="removeCollaboratorToastText">User removed from the repository.</string>
     <string name="addCollaboratorToastText">User added to the repository.</string>