Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(i18n): Fixed typo #1401

Merged
merged 4 commits into from
Oct 26, 2023
Merged

fix(i18n): Fixed typo #1401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9c0e864
fix(i18n): Fixed typo
rakekniven Oct 26, 2023
17b3d02
fix(i18n): Fixed typo
rakekniven Oct 26, 2023
1fe7fae
Generate localizable to make CI happy
SystemKeeper Oct 26, 2023
e9bbd44
Update localizable strings file.
Ivansss Oct 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions NextcloudTalk/BaseChatViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2262,7 +2262,7 @@

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)
}
}
Expand All @@ -2274,7 +2274,7 @@

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)
}
}
Expand Down Expand Up @@ -2355,7 +2355,7 @@
return super.numberOfSections(in: tableView)
}

// TODO: There should be a better place to do this

Check warning on line 2358 in NextcloudTalk/BaseChatViewController.swift

View workflow job for this annotation

GitHub Actions / SwiftLint 

Todo Violation: TODOs should be resolved (There should be a better place...) (todo)
if tableView == self.tableView, !self.dateSections.isEmpty {
tableView.backgroundView = nil
} else {
Expand Down Expand Up @@ -2747,7 +2747,7 @@
let maxPreviewWidth = self.view.bounds.size.width - self.view.safeAreaInsets.left - self.view.safeAreaInsets.right
let maxPreviewHeight = self.view.bounds.size.height * 0.6

// TODO: Take padding into account

Check warning on line 2750 in NextcloudTalk/BaseChatViewController.swift

View workflow job for this annotation

GitHub Actions / SwiftLint 

Todo Violation: TODOs should be resolved (Take padding into account) (todo)
let maxTextWidth = maxPreviewWidth - kChatCellAvatarHeight

// We need to get the height of the original cell to center the preview correctly (as the preview is always non-grouped)
Expand Down
12 changes: 6 additions & 6 deletions NextcloudTalk/en.lproj/Localizable.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 occured 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";

/* No comment provided by engineer. */
"An error occurred changing privacy setting" = "An error occurred changing privacy setting";

Expand Down Expand Up @@ -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";

Expand All @@ -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";

Expand Down
Loading