From d7f0724a3b7633da633559160957617a856d2048 Mon Sep 17 00:00:00 2001 From: Albert Gasset Date: Thu, 16 May 2019 09:52:08 +0200 Subject: [PATCH] MOBILE-2992 forum: Use web strings --- scripts/langindex.json | 12 ++++++------ src/addon/mod/forum/lang/en.json | 12 ++++++------ src/addon/mod/forum/providers/forum.ts | 12 ++++++------ src/assets/lang/en.json | 12 ++++++------ 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/scripts/langindex.json b/scripts/langindex.json index 0cbd6b03a..ff7a935dd 100644 --- a/scripts/langindex.json +++ b/scripts/langindex.json @@ -483,18 +483,18 @@ "addon.mod_forum.addanewtopic": "forum", "addon.mod_forum.addtofavourites": "forum", "addon.mod_forum.advanced": "forum", - "addon.mod_forum.bycreateddesc": "local_moodlemobileapp", - "addon.mod_forum.bycreatedasc": "local_moodlemobileapp", - "addon.mod_forum.bylastpostdesc": "local_moodlemobileapp", - "addon.mod_forum.bylastpostasc": "local_moodlemobileapp", - "addon.mod_forum.byrepliesdesc": "local_moodlemobileapp", - "addon.mod_forum.byrepliesasc": "local_moodlemobileapp", "addon.mod_forum.cannotadddiscussion": "forum", "addon.mod_forum.cannotadddiscussionall": "forum", "addon.mod_forum.cannotcreatediscussion": "forum", "addon.mod_forum.couldnotadd": "forum", "addon.mod_forum.cutoffdatereached": "forum", "addon.mod_forum.discussion": "forum", + "addon.mod_forum.discussionlistsortbycreatedasc": "forum", + "addon.mod_forum.discussionlistsortbycreateddesc": "forum", + "addon.mod_forum.discussionlistsortbylastpostasc": "forum", + "addon.mod_forum.discussionlistsortbylastpostdesc": "forum", + "addon.mod_forum.discussionlistsortbyrepliesasc": "forum", + "addon.mod_forum.discussionlistsortbyrepliesdesc": "forum", "addon.mod_forum.discussionlocked": "forum", "addon.mod_forum.discussionpinned": "forum", "addon.mod_forum.discussionsubscription": "forum", diff --git a/src/addon/mod/forum/lang/en.json b/src/addon/mod/forum/lang/en.json index 0b0181230..5b2935e89 100644 --- a/src/addon/mod/forum/lang/en.json +++ b/src/addon/mod/forum/lang/en.json @@ -4,18 +4,18 @@ "addanewtopic": "Add a new topic", "addtofavourites": "Star this discussion", "advanced": "Advanced", - "bycreateddesc": "By creation date in descending order", - "bycreatedasc": "By creation date in ascending order", - "bylastpostdesc": "By last post in descending order", - "bylastpostasc": "By last post in ascending order", - "byrepliesdesc": "By number of replies in descending order", - "byrepliesasc": "By number of replies in ascending order", "cannotadddiscussion": "Adding discussions to this forum requires group membership.", "cannotadddiscussionall": "You do not have permission to add a new discussion topic for all participants.", "cannotcreatediscussion": "Could not create new discussion", "couldnotadd": "Could not add your post due to an unknown error", "cutoffdatereached": "The cut-off date for posting to this forum is reached so you can no longer post to it.", "discussion": "Discussion", + "discussionlistsortbycreatedasc": "Sort by creation date in ascending order", + "discussionlistsortbycreateddesc": "Sort by creation date in descending order", + "discussionlistsortbylastpostasc": "Sort by last post creation date in ascending order", + "discussionlistsortbylastpostdesc": "Sort by last post creation date in descending order", + "discussionlistsortbyrepliesasc": "Sort by number of replies in ascending order", + "discussionlistsortbyrepliesdesc": "Sort by number of replies in descending order", "discussionlocked": "This discussion has been locked so you can no longer reply to it.", "discussionpinned": "Pinned", "discussionsubscription": "Discussion subscription", diff --git a/src/addon/mod/forum/providers/forum.ts b/src/addon/mod/forum/providers/forum.ts index cb78875be..0f6683e11 100644 --- a/src/addon/mod/forum/providers/forum.ts +++ b/src/addon/mod/forum/providers/forum.ts @@ -487,7 +487,7 @@ export class AddonModForumProvider { getAvailableSortOrders(): {label: string, value: number}[] { const sortOrders = [ { - label: 'addon.mod_forum.bylastpostdesc', + label: 'addon.mod_forum.discussionlistsortbylastpostdesc', value: AddonModForumProvider.SORTORDER_LASTPOST_DESC }, ]; @@ -495,23 +495,23 @@ export class AddonModForumProvider { if (this.isDiscussionListSortingAvailable()) { sortOrders.push( { - label: 'addon.mod_forum.bylastpostasc', + label: 'addon.mod_forum.discussionlistsortbylastpostasc', value: AddonModForumProvider.SORTORDER_LASTPOST_ASC }, { - label: 'addon.mod_forum.bycreateddesc', + label: 'addon.mod_forum.discussionlistsortbycreateddesc', value: AddonModForumProvider.SORTORDER_CREATED_DESC }, { - label: 'addon.mod_forum.bycreatedasc', + label: 'addon.mod_forum.discussionlistsortbycreatedasc', value: AddonModForumProvider.SORTORDER_CREATED_ASC }, { - label: 'addon.mod_forum.byrepliesdesc', + label: 'addon.mod_forum.discussionlistsortbyrepliesdesc', value: AddonModForumProvider.SORTORDER_REPLIES_DESC }, { - label: 'addon.mod_forum.byrepliesasc', + label: 'addon.mod_forum.discussionlistsortbyrepliesasc', value: AddonModForumProvider.SORTORDER_REPLIES_ASC } ); diff --git a/src/assets/lang/en.json b/src/assets/lang/en.json index 83315fe76..373327eeb 100644 --- a/src/assets/lang/en.json +++ b/src/assets/lang/en.json @@ -483,18 +483,18 @@ "addon.mod_forum.addanewtopic": "Add a new topic", "addon.mod_forum.addtofavourites": "Star this discussion", "addon.mod_forum.advanced": "Advanced", - "addon.mod_forum.bycreatedasc": "By creation date in ascending order", - "addon.mod_forum.bycreateddesc": "By creation date in descending order", - "addon.mod_forum.bylastpostasc": "By last post in ascending order", - "addon.mod_forum.bylastpostdesc": "By last post in descending order", - "addon.mod_forum.byrepliesasc": "By number of replies in ascending order", - "addon.mod_forum.byrepliesdesc": "By number of replies in descending order", "addon.mod_forum.cannotadddiscussion": "Adding discussions to this forum requires group membership.", "addon.mod_forum.cannotadddiscussionall": "You do not have permission to add a new discussion topic for all participants.", "addon.mod_forum.cannotcreatediscussion": "Could not create new discussion", "addon.mod_forum.couldnotadd": "Could not add your post due to an unknown error", "addon.mod_forum.cutoffdatereached": "The cut-off date for posting to this forum is reached so you can no longer post to it.", "addon.mod_forum.discussion": "Discussion", + "addon.mod_forum.discussionlistsortbycreatedasc": "Sort by creation date in ascending order", + "addon.mod_forum.discussionlistsortbycreateddesc": "Sort by creation date in descending order", + "addon.mod_forum.discussionlistsortbylastpostasc": "Sort by last post creation date in ascending order", + "addon.mod_forum.discussionlistsortbylastpostdesc": "Sort by last post creation date in descending order", + "addon.mod_forum.discussionlistsortbyrepliesasc": "Sort by number of replies in ascending order", + "addon.mod_forum.discussionlistsortbyrepliesdesc": "Sort by number of replies in descending order", "addon.mod_forum.discussionlocked": "This discussion has been locked so you can no longer reply to it.", "addon.mod_forum.discussionpinned": "Pinned", "addon.mod_forum.discussionsubscription": "Discussion subscription",