Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Support
    • Submit feedback
    • Contribute to GitLab
  • Sign in
Q
qtbase
  • Project overview
    • Project overview
    • Details
    • Activity
    • Releases
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
  • Labels
  • Merge Requests 5
    • Merge Requests 5
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Jobs
  • Commits
  • mer-core
  • qtbase
  • Merge Requests
  • !14

Merged
Opened Nov 28, 2016 by Kaffeine@Kaffeine
  • Report abuse
Report abuse

[qtbase] QLocale data regenerated with initial Tatar locale support. Fixes MER#1707

  • Overview 2
  • Commits 1
  • Changes 1

The Tatar locale data is taken from the recent CLDR tag (v30.0.2), but all other locales kept in the same version (v27). The language data is inserted in between, so it moves a lot of other locale data, which increases the diff.

Before the commit I verified, that generation without Tatar locale files results in no other changes, than generation timestamp in a comment.

Steps to update the data with Tatar locale support:

  1. Find out the used CLRD version. The current version is v27. (grep "Common Locale Data Repository" src/corelib/tools/qlocale_data_p.h)
  2. Download the same version at http://cldr.unicode.org/index/downloads (file core.zip)
  3. Extract the data to a directory, e.g. ~/cldr-27
  4. Generate XML data. Probably it would be more convenient to it in the "qtbase" directory: util/local_database/cldr2qlocalexml.py ~/cldr-27/common/main > locales.xml
  5. At the same directory: util/local_database/qlocalexml2cpp.py locales.xml pwd
  6. Ensure that there is no changes in code (changes in comments are OK).
  7. Choose the needed version for Tatar locale. "trunk" seems to be reasonable version at this moment. http://cldr.unicode.org/index/downloads/
  8. Download the locale files from seed/main (currently) or common/main (once the locale will be finished) to the main CLDR directory (~/cldr-27/common/main). E.g.: wget http://www.unicode.org/repos/cldr/trunk/seed/main/{tt,tt_RU}.xml; mv tt*xml ~/cldr-27/common/main;
  9. Repeat steps 4 and 5.
  10. Check that the changes are applied (git diff shows difference in src/corelib/tools/qlocale_data_p.h)
  11. Done. Optionally: make a commit.

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch "https://git.sailfishos.org/Kaffeine/qtbase.git" "qlocale_tatar-qt5.6"
git checkout -b "Kaffeine/qtbase-qlocale_tatar-qt5.6" FETCH_HEAD

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git fetch origin
git checkout "origin/mer-5.6"
git merge --no-ff "Kaffeine/qtbase-qlocale_tatar-qt5.6"

Step 4. Push the result of the merge to GitLab

git push origin "mer-5.6"

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

Assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
0
Labels
None
Assign labels
  • View project labels
Reference: mer-core/qtbase!14

Revert this merge request

This will create a new commit in order to revert the existing changes.

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.

Cherry-pick this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.