fix(pikspect): update templates for pacman questions about package co…

…nflicts (fix translations)
actionless · Sep 18, 2024 · f802c58 · f802c58
1 parent 00f6846
commit f802c58
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/pikaur/pikspect.py b/pikaur/pikspect.py
@@ -480,10 +480,10 @@ def pikspect(
         format_pacman_question("Do you want to remove these packages?"),
     ]
     questions_conflict = format_pacman_question(
-        ".* %s-.* and %s-.* are in conflict. Remove %s?", YesNo.QUESTION_YN_NO,
+        "%s-%s%s%s and %s-%s%s%s are in conflict. Remove %s?", YesNo.QUESTION_YN_NO,
     )
     questions_conflict_via_provided = format_pacman_question(
-        ".* %s-.* and %s-.* are in conflict (%s). Remove %s?", YesNo.QUESTION_YN_NO,
+        "%s-%s%s%s and %s-%s%s%s are in conflict (%s). Remove %s?", YesNo.QUESTION_YN_NO,
     )
 
     def format_conflicts(conflicts: list[list[str]]) -> list[str]:
@@ -492,12 +492,12 @@ def format_conflicts(conflicts: list[list[str]]) -> list[str]:
             for question in
             [
                 questions_conflict % (
-                    new_pkg, old_pkg, old_pkg,
+                    f".* {new_pkg}", ".*", "", "", old_pkg, ".*", "", "", old_pkg,
                 )
                 for new_pkg, old_pkg in conflicts
             ] + [
                 questions_conflict_via_provided % (
-                    new_pkg, old_pkg, ".*", old_pkg,
+                    f".* {new_pkg}", ".*", "", "", old_pkg, ".*", "", "", ".*", old_pkg,
                 )
                 for new_pkg, old_pkg in conflicts
             ]