diff --git a/.forgejo/ISSUE_TEMPLATE/config.yml b/.forgejo/ISSUE_TEMPLATE/config.yml index 5cec66533..66f935f4f 100644 --- a/.forgejo/ISSUE_TEMPLATE/config.yml +++ b/.forgejo/ISSUE_TEMPLATE/config.yml @@ -1,7 +1,7 @@ blank_issues_enabled: true contact_links: - name: Translations - url: https://codeberg.org/comaps/comaps/blob/master/docs/TRANSLATIONS.md + url: https://codeberg.org/comaps/comaps/src/branch/main/docs/TRANSLATIONS.md about: Translate CoMaps into your language - name: News url: https://comaps.app/news/ diff --git a/.forgejo/workflows/android-beta.yaml b/.forgejo/workflows/android-beta.yaml index 016c0fb27..a58169484 100644 --- a/.forgejo/workflows/android-beta.yaml +++ b/.forgejo/workflows/android-beta.yaml @@ -3,7 +3,7 @@ on: workflow_dispatch: # Manual trigger push: branches: - - master + - main paths-ignore: - .gitignore - .forgejo/** diff --git a/.forgejo/workflows/android-check.yaml b/.forgejo/workflows/android-check.yaml index be87b3cd7..41fc04745 100644 --- a/.forgejo/workflows/android-check.yaml +++ b/.forgejo/workflows/android-check.yaml @@ -3,7 +3,7 @@ on: workflow_dispatch: # Manual trigger push: branches: - - master + - main pull_request: paths-ignore: - .gitignore diff --git a/.forgejo/workflows/android-release-metadata.yaml b/.forgejo/workflows/android-release-metadata.yaml index 37fe9b59e..6fbeb16d4 100644 --- a/.forgejo/workflows/android-release-metadata.yaml +++ b/.forgejo/workflows/android-release-metadata.yaml @@ -23,7 +23,7 @@ jobs: with: repository: ${{ secrets.SCREENSHOTS_REPO }} ssh-key: ${{ secrets.SCREENSHOTS_SSH_KEY }} - ref: master + ref: main path: screenshots - name: Restore release keys diff --git a/.forgejo/workflows/android-release.yaml b/.forgejo/workflows/android-release.yaml index bf98d5c1b..d9b6ced05 100644 --- a/.forgejo/workflows/android-release.yaml +++ b/.forgejo/workflows/android-release.yaml @@ -97,7 +97,7 @@ jobs: with: repository: ${{ secrets.SCREENSHOTS_REPO }} ssh-key: ${{ secrets.SCREENSHOTS_SSH_KEY }} - ref: master + ref: main path: screenshots - name: Restore release keys diff --git a/.forgejo/workflows/ios-beta.yaml b/.forgejo/workflows/ios-beta.yaml index 2decec81f..a077c7d4b 100644 --- a/.forgejo/workflows/ios-beta.yaml +++ b/.forgejo/workflows/ios-beta.yaml @@ -3,7 +3,7 @@ on: workflow_dispatch: # Manual trigger push: branches: - - master + - main paths-ignore: - .gitignore - .forgejo/** diff --git a/.forgejo/workflows/ios-check.yaml b/.forgejo/workflows/ios-check.yaml index 608272c19..85995725f 100644 --- a/.forgejo/workflows/ios-check.yaml +++ b/.forgejo/workflows/ios-check.yaml @@ -3,7 +3,7 @@ on: workflow_dispatch: # Manual trigger push: branches: - - master + - main pull_request: paths-ignore: - .gitignore diff --git a/.forgejo/workflows/ios-release.yaml b/.forgejo/workflows/ios-release.yaml index 7a94b16fe..f1802435d 100644 --- a/.forgejo/workflows/ios-release.yaml +++ b/.forgejo/workflows/ios-release.yaml @@ -29,7 +29,7 @@ jobs: with: repository: ${{ secrets.SCREENSHOTS_REPO }} ssh-key: ${{ secrets.SCREENSHOTS_SSH_KEY }} - ref: master + ref: main path: screenshots - name: Checkout keywords @@ -37,7 +37,7 @@ jobs: with: repository: ${{ secrets.KEYWORDS_REPO }} ssh-key: ${{ secrets.KEYWORDS_SSH_KEY }} - ref: master + ref: main path: keywords - name: Update metadata diff --git a/.forgejo/workflows/linux-check.yaml b/.forgejo/workflows/linux-check.yaml index bce6b2048..b1b0b05cf 100644 --- a/.forgejo/workflows/linux-check.yaml +++ b/.forgejo/workflows/linux-check.yaml @@ -3,7 +3,7 @@ on: workflow_dispatch: # Manual trigger push: branches: - - master + - main pull_request: paths-ignore: - .gitignore diff --git a/.forgejo/workflows/macos-check.yaml b/.forgejo/workflows/macos-check.yaml index 6afdde57d..7a4737028 100644 --- a/.forgejo/workflows/macos-check.yaml +++ b/.forgejo/workflows/macos-check.yaml @@ -3,7 +3,7 @@ on: workflow_dispatch: # Manual trigger push: branches: - - master + - main pull_request: paths-ignore: - .gitignore diff --git a/data/benchmarks/update_benchmark.sh b/data/benchmarks/update_benchmark.sh index e2ffad919..409a86d9f 100755 --- a/data/benchmarks/update_benchmark.sh +++ b/data/benchmarks/update_benchmark.sh @@ -6,10 +6,10 @@ filepath+="_result.txt" adb pull /mnt/sdcard/MapsWithMe/bench/results.txt $filepath cd ~/dev/omim/ echo "current work dir : " $PWD -git checkout master +git checkout main echo "pull upstream" git fetch upstream -git merge upstream/master +git merge upstream/main echo "move to android dir" cd android/MapsWithMePro/ echo "current work dir : " $PWD diff --git a/docs/DCO.md b/docs/DCO.md index 3be238434..d722ec3ff 100644 --- a/docs/DCO.md +++ b/docs/DCO.md @@ -50,4 +50,4 @@ In the past, once someone wanted to contribute they needed to go through the CLA ## Contributors -Please feel free to add your name to [CONTRIBUTORS](https://codeberg.org/comaps/comaps/blob/master/CONTRIBUTORS) in your first PR. +Please feel free to add your name to [CONTRIBUTORS](https://codeberg.org/comaps/comaps/src/branch/main/CONTRIBUTORS) in your first PR. diff --git a/docs/PR_GUIDE.md b/docs/PR_GUIDE.md index 8b0b38313..b906632ca 100644 --- a/docs/PR_GUIDE.md +++ b/docs/PR_GUIDE.md @@ -40,7 +40,7 @@ - Functions and methods should not be long. In most cases, it's good if the whole body of a function or method fits on the monitor. It's good to write a function or a method shorter than 60 lines - Source files should not be very long - If you are solving a big task it's worth splitting it into subtasks and develop one or several PRs for every subtask. -- If it's necessary to make a big change list which should be merged to master at once, it's worth creating a branch and make PRs on it. Then to make PR with all commits of the branch to the master +- If it's necessary to make a big change list which should be merged to main at once, it's worth creating a branch and make PRs on it. Then to make PR with all commits of the branch to the main - In most cases refactoring should be done in a separate PR - If you want to refactor a significant part of the code base, it's worth discussing it with all developers before starting work - It's worth using the 'Resolve' conversation button to minimize the list of comments in a PR diff --git a/docs/SUBWAY_GENERATION.md b/docs/SUBWAY_GENERATION.md index 39e5f5f30..235aed85e 100644 --- a/docs/SUBWAY_GENERATION.md +++ b/docs/SUBWAY_GENERATION.md @@ -2,7 +2,7 @@ For the subway layer to be available in CoMaps, a `SUBWAY_URL` parameter ought to be provided to the -[map generator](https://codeberg.org/comaps/comaps/tree/master/tools/python/maps_generator). +[map generator](https://codeberg.org/comaps/comaps/src/branch/main/tools/python/maps_generator). Normally you can specify this link https://cdn.comaps.app/subway.json, which provides a regularly updated file. These instructions describe how to manually build a subway layer file. diff --git a/docs/TRANSLATIONS.md b/docs/TRANSLATIONS.md index f8b437194..b8f86dacd 100644 --- a/docs/TRANSLATIONS.md +++ b/docs/TRANSLATIONS.md @@ -64,7 +64,7 @@ Weblate maintains an internal copy of the Git repository. The repository URL can Translations are extracted from the repository and stored in an internal database, which is used by the Weblate UI. Every 24 hours, this internal database is synchronized back to the internal repository. This process can also be triggered manually via _Manage → Repository Maintenance → Commit_. -After committing changes from the internal database to the internal repository, Weblate pushes all updates to the `weblate-i18n` branch of the main Codeberg repository and creates or updates a pull request (PR) to `master`. This operation can be manually triggered via _Manage → Repository Maintenance → Push_. +After committing changes from the internal database to the internal repository, Weblate pushes all updates to the `weblate-i18n` branch of the main Codeberg repository and creates or updates a pull request (PR) to `main`. This operation can be manually triggered via _Manage → Repository Maintenance → Push_. ### Reviewing PRs @@ -81,41 +81,41 @@ The recommended approach for resolving conflicts is as follows: 2. Update the `weblate-i18n` branch on Codeberg: _Manage → Repository Maintenance → Push (button)_. 3. Locally checkout the `weblate-i18n` branch. -4. Rebase it onto `master`, resolving any conflicts during the process. -5. Push the branch to Codeberg to update the pull request, then merge the branch or PR into `master`. +4. Rebase it onto `main`, resolving any conflicts during the process. +5. Push the branch to Codeberg to update the pull request, then merge the branch or PR into `main`. 6. Reset Weblate to sync changes from GitHub: _Manage → Repository Maintenance → Reset (button)_. [weblate]: https://hosted.weblate.org/projects/organicmaps/ [contribute]: https://docs.weblate.org/en/latest/workflows.html [android_weblate]: https://hosted.weblate.org/projects/organicmaps/android/ -[android_git]: https://github.com/organicmaps/organicmaps/blob/master/android/app/src/main/res/ -[android_git_en]: https://github.com/organicmaps/organicmaps/blob/master/android/app/src/main/res/values/strings.xml +[android_git]: https://codeberg.org/comaps/comaps/src/branch/main/android/app/src/main/res +[android_git_en]: https://codeberg.org/comaps/comaps/src/branch/main/android/app/src/main/res/values/strings.xml [android_typestrings_weblate]: https://hosted.weblate.org/projects/organicmaps/android-typestrings/ -[android_typestrings_git_en]: https://github.com/organicmaps/organicmaps/blob/master/android/app/src/main/res/values/types_strings.xml +[android_typestrings_git_en]: https://codeberg.org/comaps/comaps/src/branch/main/android/app/src/main/res/values/types_strings.xml [countries_weblate]: https://hosted.weblate.org/projects/organicmaps/countries/ -[countries_git]: https://github.com/organicmaps/organicmaps/tree/master/data/countries-strings -[countries_git_en]: https://github.com/organicmaps/organicmaps/blob/master/data/countries-strings/en.json/localize.json +[countries_git]: https://codeberg.org/comaps/comaps/src/branch/main/data/countries-strings +[countries_git_en]: https://codeberg.org/comaps/comaps/src/branch/main/data/countries-strings/en.json/localize.json [ios_weblate]: https://hosted.weblate.org/projects/organicmaps/ios/ -[ios_git]: https://github.com/organicmaps/organicmaps/blob/master/iphone/Maps/LocalizedStrings/ -[ios_git_en]: https://github.com/organicmaps/organicmaps/blob/master/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings +[ios_git]: https://codeberg.org/comaps/comaps/src/branch/main/iphone/Maps/LocalizedStrings/ +[ios_git_en]: https://codeberg.org/comaps/comaps/src/branch/main/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings [ios_plist_weblate]: https://hosted.weblate.org/projects/organicmaps/ios-plist/ -[ios_plist_git_en]: https://github.com/organicmaps/organicmaps/blob/master/iphone/Maps/LocalizedStrings/en.lproj/InfoPlist.strings +[ios_plist_git_en]: https://codeberg.org/comaps/comaps/src/branch/main/iphone/Maps/LocalizedStrings/en.lproj/InfoPlist.strings [ios_typestrings_weblate]: https://hosted.weblate.org/projects/organicmaps/ios-typestrings/ -[ios_typestrings_git_en]: https://github.com/organicmaps/organicmaps/blob/master/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings +[ios_typestrings_git_en]: https://codeberg.org/comaps/comaps/src/branch/main/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings [ios_plurals_weblate]: https://hosted.weblate.org/projects/organicmaps/ios-plurals/ -[ios_plurals_git_en]: https://github.com/organicmaps/organicmaps/blob/master/iphone/Maps/LocalizedStrings/en.lproj/Localizable.stringsdict +[ios_plurals_git_en]: https://codeberg.org/comaps/comaps/src/branch/main/iphone/Maps/LocalizedStrings/en.lproj/Localizable.stringsdict [tts_weblate]: https://hosted.weblate.org/projects/organicmaps/tts/ -[tts_git]: https://github.com/organicmaps/organicmaps/tree/master/data/sound-strings -[tts_git_en]: https://github.com/organicmaps/organicmaps/blob/master/data/sound-strings/en.json/localize.json -[categories_git]: https://github.com/organicmaps/organicmaps/blob/master/data/categories.txt -[categories_cuisines_git]: https://github.com/organicmaps/organicmaps/blob/master/data/categories_cuisines.txt +[tts_git]: https://codeberg.org/comaps/comaps/src/branch/main/data/sound-strings +[tts_git_en]: https://codeberg.org/comaps/comaps/src/branch/main/data/sound-strings/en.json/localize.json +[categories_git]: https://codeberg.org/comaps/comaps/src/branch/main/data/categories.txt +[categories_cuisines_git]:https://codeberg.org/comaps/comaps/src/branch/main/data/categories_cuisines.txt [website_weblate]: https://hosted.weblate.org/projects/organicmaps/website/ -[website_git]: https://github.com/organicmaps/website/ -[website_guide]: https://github.com/organicmaps/website/blob/master/TRANSLATIONS.md -[appstore_git]: https://github.com/organicmaps/organicmaps/tree/master/iphone/metadata -[appstore_git_en]: https://github.com/organicmaps/organicmaps/tree/master/iphone/metadata/en-US -[googleplay_git]: https://github.com/organicmaps/organicmaps/tree/master/android/app/src/fdroid/play -[googleplay_git_en]: https://github.com/organicmaps/organicmaps/tree/master/android/app/src/fdroid/play/listings/en-US -[mergers]: https://github.com/orgs/organicmaps/teams/mergers/members +[website_git]: https://codeberg.org/comaps/website/ +[website_guide]: https://codeberg.org/comaps/website/src/branch/main/TRANSLATIONS.md +[appstore_git]: https://codeberg.org/comaps/comaps/src/branch/main/iphone/metadata +[appstore_git_en]: https://codeberg.org/comaps/comaps/src/branch/main/iphone/metadata/en-US +[googleplay_git]: https://codeberg.org/comaps/comaps/src/branch/main/android/app/src/fdroid/play +[googleplay_git_en]: https://codeberg.org/comaps/comaps/src/branch/main/android/app/src/fdroid/play/listings/en-US +[mergers]: https://codeberg.org/org/comaps/teams [failing_checks]: https://hosted.weblate.org/search/organicmaps/?q=has%3Acheck+AND+state%3A%3E%3Dtranslated+language%3Aru&sort_by=target&checksum=