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.

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

feat: enable hebrew locale #4922

Merged
merged 1 commit into from May 24, 2024
Merged

feat: enable hebrew locale #4922

merged 1 commit into from May 24, 2024

Conversation

ShlomoCode
Copy link

@ShlomoCode ShlomoCode commented May 8, 2024


Description:

The Hebrew translation is complete (100% of the strings), this PR activates the language.
This PR is a replacement of PR #4864 that was closed by mistake.

Copy link
Contributor

@low-batt low-batt left a comment

Choose a reason for hiding this comment

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

Two minor issues. See inline comments.

iina.xcodeproj/project.pbxproj Show resolved Hide resolved
@@ -523,6 +523,39 @@
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXFileReference section */
0507C25E2B5617650043AD05 /* he */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = he; path = he.lproj/MainMenu.strings; sourceTree = "<group>"; };
0507C25F2B5617660043AD05 /* he */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = he; path = he.lproj/MainWindowController.strings; sourceTree = "<group>"; };
Copy link
Contributor

Choose a reason for hiding this comment

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

The InfoPlist.strings file is also missing from Xcode. The file is present, but is empty. I show the Italian file for comparison:

low-batt@gag iina (he *$)$ cat he.lproj/InfoPlist.strings 
low-batt@gag iina (he *$)$ 
low-batt@gag iina (he *$)$ cat it.lproj/InfoPlist.strings 
/* (No Comment) */
"NSHumanReadableCopyright" = "Distribuito sotto licenza GPLv3";
low-batt@gag iina (he *$)$ 

Copy link
Member

Choose a reason for hiding this comment

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

I checked Base.lproj and en.lproj for this file, both of them are empty. That's why Crowdin doesn't have this string either. I'll add this string to base and en so that crowdin can pick it up.

Copy link
Author

Choose a reason for hiding this comment

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

@uiryuu I see you fixed it at #4937. Does it block this PR?

@low-batt
Copy link
Contributor

I took another look at this PR as we are currently discussing merging it. I noticed the following discrepancy. Xcode reports 35 files localized for English, but only 33 files localized for Hebrew. Many other languages only report 34 files localized so the issue is not just with the Hebrew translations:
count

I traced the difference to the two files I mention in the inline comments.

@ShlomoCode
Copy link
Author

ShlomoCode commented May 23, 2024

@low-batt The translations here on GitHub are very far from the version on crowdin. Someone with permission in crowdin (@uiryuu?) should update the files here, then I can handle the review comments here

BTW, I don't think it's worth merging this PR before merging all the other PRs that fix the design problems in RTL

@uiryuu
Copy link
Member

uiryuu commented May 23, 2024

@ShlomoCode I'll check the discrepancies between GitHub and Crowdin.

We are considering merge this PR first to better inspect all the RTL-related issues. If we find the next release version is not ready for RTL, we will disable HE language manually in the next release.

@uiryuu
Copy link
Member

uiryuu commented May 23, 2024

@ShlomoCode I checked Corwdin, and it seems to be synced with the latest develop branch. Can you point out the discrepancies you noticed between Corwdin and dev branch?

@ShlomoCode
Copy link
Author

Can you point out the discrepancies you noticed between Corwdin and dev branch?

Quick example: https://crowdin.com/editor/iina/19/en-he?view=comfortable#237
Changed 16 days ago, not applied to Github

@low-batt
Copy link
Contributor

A side issue. I confirmed the Key Bindings settings are translated now, but there are some strings that still need to be translated:
mostly-fixed

It is the two entries at the end of the KeyBindings.string file:

"read.cycle-values" = "עבור בין {{property}} ב({{{values}}})";
"read.seek" = "Seek {{#fwd}}forward{{/fwd}}{{#bwd}}backward{{/bwd}}{{#abs}}to{{/abs}} {{value}}{{#sec}}s{{/sec}}{{#per}}%{{/per}} {{#exact}}(exact){{/exact}}{{#kf}}(keyframe){{/kf}}";
"read.sub-seek" = "Seek to {{#skip_1}}next{{/skip_1}}{{#skip_-1}}previous{{/skip_-1}} subtitle";

@ShlomoCode
Copy link
Author

"read.seek" = "Seek {{#fwd}}forward{{/fwd}}{{#bwd}}backward{{/bwd}}{{#abs}}to{{/abs}} {{value}}{{#sec}}s{{/sec}}{{#per}}%{{/per}} {{#exact}}(exact){{/exact}}{{#kf}}(keyframe){{/kf}}";
"read.sub-seek" = "Seek to {{#skip_1}}next{{/skip_1}}{{#skip_-1}}previous{{/skip_-1}} subtitle";

It was translated a long time ago...
https://crowdin.com/editor/iina/27/en-he?view=comfortable#687
https://crowdin.com/editor/iina/27/en-he?view=comfortable#689
I have no idea why this doesn't affect the file on github. @uiryuu?

@uiryuu
Copy link
Member

uiryuu commented May 24, 2024

@ShlomoCode I'll sync the newly translated string to repo. You'll see the updated translations soon.

@uiryuu uiryuu changed the base branch from develop to enable-he May 24, 2024 01:22
@uiryuu uiryuu merged commit a8d64ee into iina:enable-he May 24, 2024
1 check passed
@uiryuu
Copy link
Member

uiryuu commented May 24, 2024

This PR has been merged to iina:enable-he branch. Later, with all the RTL-related PR also merged into enable-he branch, the branch will be merged into dev. @ShlomoCode Thanks for your effort for making this possible!

@ShlomoCode
Copy link
Author

ShlomoCode commented May 24, 2024

I'm curious to understand why you prefer to merge all to iina:enable-he branch as an intermediate step and not directly to dev

@uiryuu
Copy link
Member

uiryuu commented May 24, 2024

We are not sure whether or not to include RTL into 1.3.5 release or 1.4.0 beta releases, so we hold off merging them into dev branch now. If all the RTL-related issues are resolved before 1.3.5 release, we will include HE locale in 1.3.5; otherwise it goes into 1.4.0 beta releaes.

@ShlomoCode ShlomoCode deleted the he branch May 24, 2024 01:41
@ShlomoCode
Copy link
Author

@ShlomoCode I'll sync the newly translated string to repo. You'll see the updated translations soon.

In which branch do I find it?

@low-batt
Copy link
Contributor

Branch enable-he. It is listed at the top of this page after the Merged button.

@ShlomoCode
Copy link
Author

I don't see the translations sync commit
CleanShot 2024-05-24 at 15 51 11@2x

@low-batt
Copy link
Contributor

I had noticed that as well. Need to ask @uiryuu about that. I don't know how to investigate that.

I'm not seeing nightly builds, so maybe an issue with our server?

@uiryuu
Copy link
Member

uiryuu commented May 24, 2024

@ShlomoCode The Crowdin integration is not working now. Im still struggling at finding a solution.

uiryuu pushed a commit that referenced this pull request May 25, 2024
@uiryuu
Copy link
Member

uiryuu commented May 25, 2024

@ShlomoCode Fixed the Crowdin integration and rebased enable-he to the latest dev branch. Now you can see the latest translations on the enable-he branch.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add support for Hebrew locale
3 participants