Merge different languages for language stats #24900
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
GiteaBot
added
the
lgtm/need 2
pull-request-size
bot
added
the
size/M
lunny
approved these changes
May 24, 2023
GiteaBot
added
lgtm/need 1
lunny
added
the
outdated/backport/v1.19
silverwind
reviewed
May 24, 2023
silverwind
approved these changes
May 24, 2023
GiteaBot
added
lgtm/done
silverwind
changed the title
techknowlogick
added
the
reviewed/wait-merge
|
I was unable to create a backport for 1.19. @wxiaoguang, please send one manually. 🍵 |
GiteaBot
added
backport/manual
wxiaoguang
added a commit
to wxiaoguang/gitea
that referenced
this pull request
May 25, 2023
Fix go-gitea#24896 If users set different languages by `linguist-language`, the `stats` map could be: `java: 100, Java: 200`. Language stats are stored as case-insensitive in database and there is a unique key. So, the different language names should be merged to one unique name: `Java: 300`
|
backport -> Merge different languages for language stats #24921 |
zjjhot
added a commit
to zjjhot/gitea
that referenced
this pull request
May 25, 2023
* upstream/main: (21 commits) `zh-cn` translation for usage docs (go-gitea#24897) Add chinese documentations for installation (go-gitea#24904) Improve RunMode / dev mode (go-gitea#24886) Add chinese documentations for `Packages` (go-gitea#24914) Rework notifications list (go-gitea#24812) New webhook trigger for receiving Pull Request review requests (go-gitea#24481) Use file filters action instead of Github's files filter (go-gitea#24877) Update Asciidoc markup example with safe defaults (go-gitea#24920) Add self to maintainers (go-gitea#23644) Create pull request for base after editing file, if not enabled on fork (go-gitea#24841) Reduce verbosity of dev commands (go-gitea#24917) Merge different languages for language stats (go-gitea#24900) Add missing test case and fix typo in tests (go-gitea#24915) Improve confusable character string (go-gitea#24911) Improve Actions CSS (go-gitea#24864) Fix <empty> in administration/config-cheat-sheet.en-us.md (go-gitea#24905) Only validate changed columns when update user (go-gitea#24867) Rename docs packages title from xxx Packages Repository -> xxx Package Registry (go-gitea#24895) Fix can’t move anymore items in repo project boards (go-gitea#24892) Make environment-to-ini support loading key value from file (go-gitea#24832) ... # Conflicts: # web_src/css/helpers.css
silverwind
pushed a commit
that referenced
this pull request
May 25, 2023
Backport #24900 Fix #24896 If users set different languages by `linguist-language`, the `stats` map could be: `java: 100, Java: 200`. Language stats are stored as case-insensitive in database and there is a unique key. So, the different language names should be merged to one unique name: `Java: 300`
Codeberg-org
pushed a commit
to Codeberg-org/gitea
that referenced
this pull request
Jun 3, 2023
…ea#24921) Backport go-gitea#24900 Fix go-gitea#24896 If users set different languages by `linguist-language`, the `stats` map could be: `java: 100, Java: 200`. Language stats are stored as case-insensitive in database and there is a unique key. So, the different language names should be merged to one unique name: `Java: 300` (cherry picked from commit a83d597)
# for free
to subscribe to this conversation on GitHub.
Already have an account?
#.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix #24896
If users set different languages by
linguist-language, thestatsmap could be:java: 100, Java: 200.Language stats are stored as case-insensitive in database and there is a unique key.
So, the different language names should be merged to one unique name:
Java: 300