Skip to content

Conversation

Joshdike
Copy link
Contributor

No description provided.

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jul 11, 2025
@JamesSkemp
Copy link

Based upon casing, I wonder if the period additions for lines 323 and 353 is correct?

1038 and 1039 also read fine to me as they were; the original it's flows better than it is (IMO).

1105 has a url that should probably be URL to match the other instance.

@Joshdike
Copy link
Contributor Author

Based upon casing, I wonder if the period additions for lines 323 and 353 is correct?

1038 and 1039 also read fine to me as they were; the original it's flows better than it is (IMO).

1105 has a url that should probably be URL to match the other instance.

The period additions in 323 and 353 doesn't matter but i could remove them.
Same goes for 1038 and 1039.
You are right about 1105. I should make it URL instead of url

@dr-1
Copy link
Contributor

dr-1 commented Jul 12, 2025

I still see quite a few language issues in the file. The fixes in this PR are great but I would suggest to remove the "all" from the commit message when squashing and merging. Happy to contribute a separate PR after that's done to fix more of the issues.

@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Jul 12, 2025
Copy link
Contributor

@wxiaoguang wxiaoguang left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you very much!

@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Jul 14, 2025
@wxiaoguang
Copy link
Contributor

wxiaoguang commented Jul 14, 2025

Hmm .... just found that the new text is too long for a "menu item" 🤣

image

@Joshdike
Copy link
Contributor Author

Hmmn. We can use "Block user from this organization"
what do you think?

@wxiaoguang
Copy link
Contributor

Hmmn. We can use "Block user from this organization" what do you think?

Yep, so your original "Block user from organization" should work

@Joshdike
Copy link
Contributor Author

Yep, so your original "Block user from organization" should work
Alright. I guess you will commit it directly after this merge?

@@ -358,7 +358,7 @@ no_reply_address = Hidden Email Domain
no_reply_address_helper = Domain name for users with a hidden email address. For example, the username 'joe' will be logged in Git as '[email protected]' if the hidden email domain is set to 'noreply.example.org'.
password_algorithm = Password Hash Algorithm
invalid_password_algorithm = Invalid password hash algorithm
password_algorithm_helper = Set the password hashing algorithm. Algorithms have differing requirements and strength. The argon2 algorithm is rather secure but uses a lot of memory and may be inappropriate for small systems.
password_algorithm_helper = Set the password hashing algorithm. Algorithms have differing requirements and strengths. The argon2 algorithm is rather secure but uses a lot of memory and may be inappropriate for small systems.
Copy link
Contributor

@dr-1 dr-1 Jul 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It depends on what is meant here.

"Algorithm A has this (qualitative) strength and algorithm B has that strength" → strengths
vs.
"Algorithms A and B differ in how strong they are" → strength

Based on the subsequent sentence, I guess it's more the first meaning.

@wxiaoguang wxiaoguang enabled auto-merge (squash) July 14, 2025 13:04
@wxiaoguang wxiaoguang merged commit b861d86 into go-gitea:main Jul 14, 2025
26 checks passed
@GiteaBot GiteaBot added this to the 1.25.0 milestone Jul 14, 2025
@Joshdike Joshdike deleted the Joshdike branch July 14, 2025 13:53
zjjhot added a commit to zjjhot/gitea that referenced this pull request Jul 16, 2025
* giteaofficial/main:
  Send email on Workflow Run Success/Failure (go-gitea#34982)
  [skip ci] Updated translations via Crowdin
  Replace `poetry` with `uv` (go-gitea#35084)
  nix flake update (go-gitea#35085)
  Use monospace font in PR command line instructions (go-gitea#35074)
  Add gitignore rules to exclude LLM instruction files (go-gitea#35076)
  [skip ci] Updated translations via Crowdin
  Fix form property assignment edge case (go-gitea#35073)
  Improve submodule relative path handling (go-gitea#35056)
  Fixed all grammatical errors in locale_en-US.ini (go-gitea#35053)
  UI: add hover background to table rows in user and repo admin page (go-gitea#35072)
saschazepter pushed a commit to saschazepter/forgejo that referenced this pull request Jul 22, 2025
This commit has the following:
* partial port of changes from [gitea#35053](go-gitea/gitea#35053) ([corresponding WCP](https://codeberg.org/forgejo/forgejo/pulls/8591))
    * some changes were applied
    * some strings we've fixed ourself before
    * some strings we don't have
* a few fixes I wanted to propose but didn't want to dedicate a PR just to add a full stop to one string

Co-authored-by: DJ Phoenix <[email protected]>
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/8593
Reviewed-by: Robert Wolff <[email protected]>
Reviewed-by: Gusted <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/translation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants