From 9c0e8640162ec515b236e0466ff820676aefd531 Mon Sep 17 00:00:00 2001 From: rakekniven <2069590+rakekniven@users.noreply.github.com> Date: Thu, 26 Oct 2023 07:48:48 +0200 Subject: [PATCH 1/4] fix(i18n): Fixed typo Signed-off-by: rakekniven <2069590+rakekniven@users.noreply.github.com> --- NextcloudTalk/en.lproj/Localizable.strings | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/NextcloudTalk/en.lproj/Localizable.strings b/NextcloudTalk/en.lproj/Localizable.strings index 3a0d602d7..c70f76bd2 100644 --- a/NextcloudTalk/en.lproj/Localizable.strings +++ b/NextcloudTalk/en.lproj/Localizable.strings @@ -182,10 +182,10 @@ "An administrator removed {user0} and {user1}" = "An administrator removed {user0} and {user1}"; /* No comment provided by engineer. */ -"An error occured while adding a reaction to a message" = "An error occured while adding a reaction to a message"; +"An error occurred while adding a reaction to a message" = "An error occured while adding a reaction to a message"; /* No comment provided by engineer. */ -"An error occured while removing a reaction from a message" = "An error occured while removing a reaction from a message"; +"An error occurred while removing a reaction from a message" = "An error occured while removing a reaction from a message"; /* No comment provided by engineer. */ "An error occurred changing privacy setting" = "An error occurred changing privacy setting"; From 17b3d028822065252d3ecfb2ebf638c5a63da64b Mon Sep 17 00:00:00 2001 From: rakekniven <2069590+rakekniven@users.noreply.github.com> Date: Thu, 26 Oct 2023 07:51:03 +0200 Subject: [PATCH 2/4] fix(i18n): Fixed typo Signed-off-by: rakekniven <2069590+rakekniven@users.noreply.github.com> --- NextcloudTalk/BaseChatViewController.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/NextcloudTalk/BaseChatViewController.swift b/NextcloudTalk/BaseChatViewController.swift index c10a87ce8..a9e14b72d 100644 --- a/NextcloudTalk/BaseChatViewController.swift +++ b/NextcloudTalk/BaseChatViewController.swift @@ -2262,7 +2262,7 @@ import QuickLook NCAPIController.sharedInstance().addReaction(reaction, toMessage: message.messageId, inRoom: self.room.token, for: activeAccount) { _, error, _ in if error != nil { - self.view.makeToast(NSLocalizedString("An error occured while adding a reaction to a message", comment: ""), duration: 5, position: CSToastPositionCenter) + self.view.makeToast(NSLocalizedString("An error occurred while adding a reaction to a message", comment: ""), duration: 5, position: CSToastPositionCenter) self.removeTemporaryReaction(reaction: reaction, forMessageId: message.messageId) } } @@ -2274,7 +2274,7 @@ import QuickLook NCAPIController.sharedInstance().removeReaction(reaction, fromMessage: message.messageId, inRoom: self.room.token, for: activeAccount) { _, error, _ in if error != nil { - self.view.makeToast(NSLocalizedString("An error occured while removing a reaction from a message", comment: ""), duration: 5, position: CSToastPositionCenter) + self.view.makeToast(NSLocalizedString("An error occurred while removing a reaction from a message", comment: ""), duration: 5, position: CSToastPositionCenter) self.removeTemporaryReaction(reaction: reaction, forMessageId: message.messageId) } } From 1fe7faecefee9990f289798b1680738a9dbb1bab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcel=20M=C3=BCller?= Date: Thu, 26 Oct 2023 08:32:44 +0200 Subject: [PATCH 3/4] Generate localizable to make CI happy MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Marcel Müller --- NextcloudTalk/en.lproj/Localizable.strings | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/NextcloudTalk/en.lproj/Localizable.strings b/NextcloudTalk/en.lproj/Localizable.strings index c70f76bd2..96ca7264c 100644 --- a/NextcloudTalk/en.lproj/Localizable.strings +++ b/NextcloudTalk/en.lproj/Localizable.strings @@ -1,4 +1,4 @@ -/* No comment provided by engineer. */ +/* No comment provided by engineer. */ "%@ added to this new group conversation" = "%@ added to this new group conversation"; /* No comment provided by engineer. */ @@ -181,12 +181,6 @@ /* Please put {user0} and {user1} placeholders in the correct position on the translated text but do not translate them */ "An administrator removed {user0} and {user1}" = "An administrator removed {user0} and {user1}"; -/* No comment provided by engineer. */ -"An error occurred while adding a reaction to a message" = "An error occured while adding a reaction to a message"; - -/* No comment provided by engineer. */ -"An error occurred while removing a reaction from a message" = "An error occured while removing a reaction from a message"; - /* No comment provided by engineer. */ "An error occurred changing privacy setting" = "An error occurred changing privacy setting"; @@ -226,6 +220,9 @@ /* No comment provided by engineer. */ "An error occurred while adding %@ to the room" = "An error occurred while adding %@ to the room"; +/* No comment provided by engineer. */ +"An error occurred while adding a reaction to a message" = "An error occurred while adding a reaction to a message"; + /* No comment provided by engineer. */ "An error occurred while adding note" = "An error occurred while adding note"; @@ -244,6 +241,9 @@ /* No comment provided by engineer. */ "An error occurred while opening the file %@" = "An error occurred while opening the file %@"; +/* No comment provided by engineer. */ +"An error occurred while removing a reaction from a message" = "An error occurred while removing a reaction from a message"; + /* No comment provided by engineer. */ "An error occurred while removing the avatar" = "An error occurred while removing the avatar"; From e9bbd44af5dc45645abedf32938860cae9033577 Mon Sep 17 00:00:00 2001 From: Ivan Sein Date: Thu, 26 Oct 2023 09:00:33 +0200 Subject: [PATCH 4/4] Update localizable strings file. Signed-off-by: Ivan Sein --- NextcloudTalk/en.lproj/Localizable.strings | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NextcloudTalk/en.lproj/Localizable.strings b/NextcloudTalk/en.lproj/Localizable.strings index 96ca7264c..64d85a1df 100644 --- a/NextcloudTalk/en.lproj/Localizable.strings +++ b/NextcloudTalk/en.lproj/Localizable.strings @@ -1,4 +1,4 @@ -/* No comment provided by engineer. */ +/* No comment provided by engineer. */ "%@ added to this new group conversation" = "%@ added to this new group conversation"; /* No comment provided by engineer. */