From a8aad4cbdcbe9645733cf8b15c96509737e30176 Mon Sep 17 00:00:00 2001
From: Albert Gasset <albertgasset@fsfe.org>
Date: Wed, 22 May 2019 16:23:17 +0200
Subject: [PATCH] MOBILE-2988 forum: New lock/unlock discussion strings

---
 scripts/langindex.json                               | 4 ++--
 src/addon/mod/forum/lang/en.json                     | 4 ++--
 src/addon/mod/forum/pages/discussion/discussion.html | 4 ++--
 src/assets/lang/en.json                              | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/scripts/langindex.json b/scripts/langindex.json
index 43ba30b47..bc21d1711 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -506,14 +506,13 @@
   "addon.mod_forum.favouriteupdated": "forum",
   "addon.mod_forum.forumnodiscussionsyet": "local_moodlemobileapp",
   "addon.mod_forum.group": "local_moodlemobileapp",
-  "addon.mod_forum.locked": "forum",
+  "addon.mod_forum.lockdiscussion": "forum",
   "addon.mod_forum.lockupdated": "forum",
   "addon.mod_forum.message": "forum",
   "addon.mod_forum.modeflatnewestfirst": "forum",
   "addon.mod_forum.modeflatoldestfirst": "forum",
   "addon.mod_forum.modenested": "forum",
   "addon.mod_forum.modulenameplural": "forum",
-  "addon.mod_forum.notlocked": "forum",
   "addon.mod_forum.numdiscussions": "local_moodlemobileapp",
   "addon.mod_forum.numreplies": "local_moodlemobileapp",
   "addon.mod_forum.pindiscussion": "forum",
@@ -530,6 +529,7 @@
   "addon.mod_forum.subject": "forum",
   "addon.mod_forum.thisforumhasduedate": "forum",
   "addon.mod_forum.thisforumisdue": "forum",
+  "addon.mod_forum.unlockdiscussion": "forum",
   "addon.mod_forum.unpindiscussion": "forum",
   "addon.mod_forum.unread": "forum",
   "addon.mod_forum.unreadpostsnumber": "forum",
diff --git a/src/addon/mod/forum/lang/en.json b/src/addon/mod/forum/lang/en.json
index 5b2935e89..61cee03e9 100644
--- a/src/addon/mod/forum/lang/en.json
+++ b/src/addon/mod/forum/lang/en.json
@@ -27,14 +27,13 @@
     "favouriteupdated": "Your star option has been updated.",
     "forumnodiscussionsyet": "There are no discussions yet in this forum.",
     "group": "Group",
-    "locked": "Locked",
+    "lockdiscussion": "Lock this discussion",
     "lockupdated": "The lock option has been updated.",
     "message": "Message",
     "modeflatnewestfirst": "Display replies flat, with newest first",
     "modeflatoldestfirst": "Display replies flat, with oldest first",
     "modenested": "Display replies in nested form",
     "modulenameplural": "Forums",
-    "notlocked": "Lock",
     "numdiscussions": "{{numdiscussions}} discussions",
     "numreplies": "{{numreplies}} replies",
     "pindiscussion": "Pin this discussion",
@@ -51,6 +50,7 @@
     "subject": "Subject",
     "thisforumhasduedate": "The due date for posting to this forum is {{$a}}.",
     "thisforumisdue": "The due date for posting to this forum was {{$a}}.",
+    "unlockdiscussion": "Unlock this discussion",
     "unpindiscussion": "Unpin this discussion",
     "unread": "Unread",
     "unreadpostsnumber": "{{$a}} unread posts"
diff --git a/src/addon/mod/forum/pages/discussion/discussion.html b/src/addon/mod/forum/pages/discussion/discussion.html
index b569fb0d1..9111ecdd5 100644
--- a/src/addon/mod/forum/pages/discussion/discussion.html
+++ b/src/addon/mod/forum/pages/discussion/discussion.html
@@ -13,8 +13,8 @@
         <core-context-menu-item [hidden]="sort == 'flat-oldest'" [priority]="500" [content]="'addon.mod_forum.modeflatoldestfirst' | translate" (action)="changeSort('flat-oldest')" iconAction="arrow-round-down"></core-context-menu-item>
         <core-context-menu-item [hidden]="sort == 'flat-newest'" [priority]="450" [content]="'addon.mod_forum.modeflatnewestfirst' | translate" (action)="changeSort('flat-newest')" iconAction="arrow-round-up"></core-context-menu-item>
         <core-context-menu-item [hidden]="sort == 'nested'" [priority]="400" [content]="'addon.mod_forum.modenested' | translate" (action)="changeSort('nested')" iconAction="swap"></core-context-menu-item>
-        <core-context-menu-item [hidden]="!discussion || !discussion.canlock || discussion.locked" [priority]="300" [content]="'addon.mod_forum.notlocked' | translate" (action)="setLockState(true)" iconAction="fa-unlock"></core-context-menu-item>
-        <core-context-menu-item [hidden]="!discussion || !discussion.canlock || !discussion.locked" [priority]="300" [content]="'addon.mod_forum.locked' | translate" (action)="setLockState(false)" iconAction="fa-lock"></core-context-menu-item>
+        <core-context-menu-item [hidden]="!discussion || !discussion.canlock || discussion.locked" [priority]="300" [content]="'addon.mod_forum.lockdiscussion' | translate" (action)="setLockState(true)" iconAction="fa-lock"></core-context-menu-item>
+        <core-context-menu-item [hidden]="!discussion || !discussion.canlock || !discussion.locked" [priority]="300" [content]="'addon.mod_forum.unlockdiscussion' | translate" (action)="setLockState(false)" iconAction="fa-unlock"></core-context-menu-item>
         <core-context-menu-item [hidden]="!discussion || !canPin || discussion.pinned" [priority]="250" [content]="'addon.mod_forum.pindiscussion' | translate" (action)="setPinState(true)" iconAction="fa-map-pin"></core-context-menu-item>
         <core-context-menu-item [hidden]="!discussion || !canPin || !discussion.pinned" [priority]="250" [content]="'addon.mod_forum.unpindiscussion' | translate" (action)="setPinState(false)" iconAction="fa-map-pin" [iconSlash]="true"></core-context-menu-item>
         <core-context-menu-item [hidden]="!discussion || !discussion.canfavourite || discussion.starred" [priority]="200" [content]="'addon.mod_forum.addtofavourites' | translate" (action)="toggleFavouriteState(true)" iconAction="fa-star"></core-context-menu-item>
diff --git a/src/assets/lang/en.json b/src/assets/lang/en.json
index 70f0b0601..83eaa3729 100644
--- a/src/assets/lang/en.json
+++ b/src/assets/lang/en.json
@@ -506,14 +506,13 @@
     "addon.mod_forum.favouriteupdated": "Your star option has been updated.",
     "addon.mod_forum.forumnodiscussionsyet": "There are no discussions yet in this forum.",
     "addon.mod_forum.group": "Group",
-    "addon.mod_forum.locked": "Locked",
+    "addon.mod_forum.lockdiscussion": "Lock this discussion",
     "addon.mod_forum.lockupdated": "The lock option has been updated.",
     "addon.mod_forum.message": "Message",
     "addon.mod_forum.modeflatnewestfirst": "Display replies flat, with newest first",
     "addon.mod_forum.modeflatoldestfirst": "Display replies flat, with oldest first",
     "addon.mod_forum.modenested": "Display replies in nested form",
     "addon.mod_forum.modulenameplural": "Forums",
-    "addon.mod_forum.notlocked": "Lock",
     "addon.mod_forum.numdiscussions": "{{numdiscussions}} discussions",
     "addon.mod_forum.numreplies": "{{numreplies}} replies",
     "addon.mod_forum.pindiscussion": "Pin this discussion",
@@ -530,6 +529,7 @@
     "addon.mod_forum.subject": "Subject",
     "addon.mod_forum.thisforumhasduedate": "The due date for posting to this forum is {{$a}}.",
     "addon.mod_forum.thisforumisdue": "The due date for posting to this forum was {{$a}}.",
+    "addon.mod_forum.unlockdiscussion": "Unlock this discussion",
     "addon.mod_forum.unpindiscussion": "Unpin this discussion",
     "addon.mod_forum.unread": "Unread",
     "addon.mod_forum.unreadpostsnumber": "{{$a}} unread posts",