From 70bc246a7f5c1530b76d6e22298c46e89ce10a41 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 12 May 2021 08:41:59 +0200
Subject: [PATCH] MOBILE-3757 lang: Remove duplicated userwithid string

---
 scripts/langindex.json             | 4 ++--
 src/addons/mod/assign/lang.json    | 3 +--
 src/addons/notes/lang.json         | 3 +--
 src/addons/notes/services/notes.ts | 2 +-
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/scripts/langindex.json b/scripts/langindex.json
index 8d321dcc6..7ca7eb8c2 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -408,7 +408,6 @@
   "addon.mod_assign.ungroupedusersoptional": "assign",
   "addon.mod_assign.unlimitedattempts": "assign",
   "addon.mod_assign.userswhoneedtosubmit": "assign",
-  "addon.mod_assign.userwithid": "local_moodlemobileapp",
   "addon.mod_assign.viewsubmission": "assign",
   "addon.mod_assign.warningsubmissiongrademodified": "local_moodlemobileapp",
   "addon.mod_assign.warningsubmissionmodified": "local_moodlemobileapp",
@@ -1041,7 +1040,6 @@
   "addon.notes.personalnotes": "notes",
   "addon.notes.publishstate": "notes",
   "addon.notes.sitenotes": "notes",
-  "addon.notes.userwithid": "local_moodlemobileapp",
   "addon.notes.warningnotenotsent": "local_moodlemobileapp",
   "addon.notifications.errorgetnotifications": "local_moodlemobileapp",
   "addon.notifications.markallread": "moodle",
@@ -1481,6 +1479,7 @@
   "core.course.nocontentavailable": "local_moodlemobileapp",
   "core.course.overriddennotice": "grades",
   "core.course.refreshcourse": "local_moodlemobileapp",
+  "core.course.section": "moodle",
   "core.course.sections": "moodle",
   "core.course.useactivityonbrowser": "local_moodlemobileapp",
   "core.course.warningmanualcompletionmodified": "local_moodlemobileapp",
@@ -2209,6 +2208,7 @@
   "core.user.sendemail": "local_moodlemobileapp",
   "core.user.student": "moodle/defaultcoursestudent",
   "core.user.teacher": "moodle/noneditingteacher",
+  "core.user.userwithid": "local_moodlemobileapp",
   "core.user.webpage": "moodle",
   "core.userdeleted": "moodle",
   "core.userdetails": "moodle",
diff --git a/src/addons/mod/assign/lang.json b/src/addons/mod/assign/lang.json
index 5311cdf8a..37a598c17 100644
--- a/src/addons/mod/assign/lang.json
+++ b/src/addons/mod/assign/lang.json
@@ -95,10 +95,9 @@
     "ungroupedusers": "The setting 'Require group to make submission' is enabled and some users are either not a member of any group, or are a member of more than one group, so are unable to make submissions.",
     "ungroupedusersoptional": "The setting 'Students submit in groups' is enabled and some users are either not a member of any group, or are a member of more than one group. Please be aware that these students will submit as members of the 'Default group'.",
     "unlimitedattempts": "Unlimited",
-    "userwithid": "User with ID {{id}}",
     "userswhoneedtosubmit": "Users who need to submit: {{$a}}",
     "viewsubmission": "View submission",
     "warningsubmissionmodified": "The user submission was modified on the site.",
     "warningsubmissiongrademodified": "The submission grade was modified on the site.",
     "wordlimit": "Word limit"
-}
\ No newline at end of file
+}
diff --git a/src/addons/notes/lang.json b/src/addons/notes/lang.json
index c8256d0c4..732140ed1 100644
--- a/src/addons/notes/lang.json
+++ b/src/addons/notes/lang.json
@@ -10,6 +10,5 @@
     "personalnotes": "Personal notes",
     "publishstate": "Context",
     "sitenotes": "Site notes",
-    "userwithid": "User with ID {{id}}",
     "warningnotenotsent": "Couldn't add note(s) to course {{course}}. {{error}}"
-}
\ No newline at end of file
+}
diff --git a/src/addons/notes/services/notes.ts b/src/addons/notes/services/notes.ts
index 7d6a05515..27660a22f 100644
--- a/src/addons/notes/services/notes.ts
+++ b/src/addons/notes/services/notes.ts
@@ -370,7 +370,7 @@ export class AddonNotesProvider {
 
                 return;
             }).catch(() => {
-                note.userfullname = Translate.instant('addon.notes.userwithid', { id: note.userid });
+                note.userfullname = Translate.instant('core.user.userwithid', { id: note.userid });
             }));
 
         await Promise.all(promises);