chore: clean up in-code uk translations | FC-55 #465

OmarIthawi · 2024-06-13T21:07:23Z

Clean up after #422

make pull_translations should be used

openedx-webhooks · 2024-06-13T21:07:28Z

Thanks for the pull request, @OmarIthawi!

What's next?

Please work through the following steps to get your changes ready for engineering review:

🔘 Get product approval

If you haven't already, check this list to see if your contribution needs to go through the product review process.

If it does, you'll need to submit a product proposal for your contribution, and have it reviewed by the Product Working Group.
- This process (including the steps you'll need to take) is documented here.
If it doesn't, simply proceed with the next step.

🔘 Provide context

To help your reviewers and other members of the community understand the purpose and larger context of your changes, feel free to add as much of the following information to the PR description as you can:

Dependencies

This PR must be merged before / after / at the same time as ...
Blockers

This PR is waiting for OEP-1234 to be accepted.
Timeline information

This PR must be merged by XX date because ...
Partner information

This is for a course on edx.org.
Supporting documentation
Relevant Open edX discussion forum threads

🔘 Get a green build

If one or more checks are failing, continue working on your changes until this is no longer the case and your build turns green.

🔘 Let us know that your PR is ready for review:

Who will review my changes?

This repository is currently maintained by @openedx/openedx-mobile-maintainers. Tag them in a comment and let them know that your changes are ready for review.

Where can I find more information?

If you'd like to get more details on all aspects of the review process for open source pull requests (OSPRs), check out the following resources:

When can I expect my changes to be merged?

Our goal is to get community contributions seen and reviewed as efficiently as possible.

However, the amount of time that it takes to review and merge a PR can vary significantly based on factors such as:

The size and impact of the changes that it introduces
The need for product review
Maintenance status of the parent repository

💡 As a result it may take up to several weeks or months to complete a review and merge your PR.

volodymyr-chekyrta · 2024-06-18T10:00:41Z

@OmarIthawi, could you please fix the tests? You've deleted files, but something is still looking for them.

The following build commands failed:
	CopyStringsFile /Users/runner/Library/Developer/Xcode/DerivedData/OpenEdX-bsdxmseilanfjjcjomwdntdeffpi/Build/Products/DebugDev-iphonesimulator/Core.framework/uk.lproj/Localizable.strings /Users/runner/work/openedx-app-ios/openedx-app-ios/Core/Core/uk.lproj/Localizable.strings (in target 'Core' from project 'Core')

OmarIthawi · 2024-06-20T21:27:42Z

@OmarIthawi, could you please fix the tests? You've deleted files, but something is still looking for them.

The following build commands failed:
	CopyStringsFile /Users/runner/Library/Developer/Xcode/DerivedData/OpenEdX-bsdxmseilanfjjcjomwdntdeffpi/Build/Products/DebugDev-iphonesimulator/Core.framework/uk.lproj/Localizable.strings /Users/runner/work/openedx-app-ios/openedx-app-ios/Core/Core/uk.lproj/Localizable.strings (in target 'Core' from project 'Core')

I tried to fix the failing test but I'm unsure how to find the step CopyStringsFile. Could you please help?

@volodymyr-chekyrta Please try to checkout the branch, run Project -> Clean and it should fix the issue. I don't have XCode on my Linux machine which makes this not possible.

volodymyr-chekyrta · 2024-06-21T08:35:36Z

@OmarIthawi, could you please fix the tests? You've deleted files, but something is still looking for them.
The following build commands failed:
	CopyStringsFile /Users/runner/Library/Developer/Xcode/DerivedData/OpenEdX-bsdxmseilanfjjcjomwdntdeffpi/Build/Products/DebugDev-iphonesimulator/Core.framework/uk.lproj/Localizable.strings /Users/runner/work/openedx-app-ios/openedx-app-ios/Core/Core/uk.lproj/Localizable.strings (in target 'Core' from project 'Core')
I tried to fix the failing test but I'm unsure how to find the step CopyStringsFile. Could you please help?

@volodymyr-chekyrta Please try to checkout the branch, run Project -> Clean and it should fix the issue. I don't have XCode on my Linux machine which makes this not possible.

I tried this, but the project build fails.
The files are not deleted correctly because the project files are still referenced; you have to remove them from XCode.
Does anyone on your team have XCode? Or maybe I can help you with this.

OmarIthawi · 2024-06-21T12:37:27Z

@volodymyr-chekyrta please help, that would be really appreciated.

We only need to delete those files now they're backed to Transifex

Our iOS engineer is juggling a couple of tasks already and I need her focused on SAML SSO :) and I'm filling up gaps whenever I can.

volodymyr-chekyrta · 2024-06-21T13:38:16Z

@volodymyr-chekyrta please help, that would be really appreciated.

We only need to delete those files now they're backed to Transifex

Our iOS engineer is juggling a couple of tasks already and I need her focused on SAML SSO :) and I'm filling up gaps whenever I can.

Could you please give me write permissions to this branch in your repo?
I'll fix it and push changes

OmarIthawi · 2024-06-21T14:41:12Z

@volodymyr-chekyrta you now have write access to the branches. I think we need to revert the change and remove the files manually again via the XCode UI.

volodymyr-chekyrta · 2024-06-21T15:13:38Z

@OmarIthawi Okay, that approach won't work :(
If we remove links from the translation files and then pull them via make pull_translations, files will be physically on the disk, but the project will not know about them.

OmarIthawi · 2024-06-21T15:43:04Z

Okay, that approach won't work :(

@volodymyr-chekyrta That's an issue. How did we manage the tx pull in previous versions of the application such as:

https://github.com/openedx-unsupported/edx-app-ios/commits/master/Source/ar.lproj/Localizable.strings

I suppose people didn't just manually edit those files, did they?

OmarIthawi · 2024-06-21T17:20:55Z

@volodymyr-chekyrta I've checked about the issue more and I have some ideas:

Option 1: Use xcString files

I'm not an iOS expert, but if the xcstrings can fit all translations in a single file, I suppose that'll help.

Apple demonstration video: https://developer.apple.com/videos/play/wwdc2023/10155/
Example Localizable.xcstrings file: https://github.com/glushchenko/fsnotes/blob/814948cdd46091739b7c975bf86f129ba32c8ca5/FSNotes/Localizable.xcstrings#L6-L29

Which is as far as I understand, uses one JSON file for all languages.

Option 2: Automate adding the files

The other alternative it to automatically add the uk and other languages after pulling them via Transifex. This can be done via libraries like https://github.com/kronenthaler/mod-pbxproj

OmarIthawi · 2024-06-22T01:54:18Z

@volodymyr-chekyrta I've made some progress regarding the XCode project file edits, I'll pickup the work again in a day or two.

OmarIthawi

@volodymyr-chekyrta this is ready for another review.

OmarIthawi · 2024-06-23T11:40:42Z

Authorization/Authorization.xcodeproj/project.pbxproj

-/* Begin PBXHeadersBuildPhase section */
-		0770DE3628D0A319006D8A5D /* Headers */ = {
-			isa = PBXHeadersBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXHeadersBuildPhase section */


@volodymyr-chekyrta is this concerning?

OmarIthawi · 2024-06-23T11:41:10Z

Authorization/Authorization.xcodeproj/project.pbxproj

@@ -306,7 +295,6 @@
 				737436DC910C5A48E4C01AC7 /* [CP] Check Pods Manifest.lock */,
 				07169450296D913300E3DED6 /* Sources */,
 				07169451296D913300E3DED6 /* Frameworks */,
-				07169452296D913300E3DED6 /* Resources */,


I'm unsure what's being removed here by the https://github.com/kronenthaler/mod-pbxproj package. It's automatic.

volodymyr-chekyrta · 2024-06-25T07:43:53Z

@OmarIthawi, seems the script adding files to the wrong location

volodymyr-chekyrta · 2024-06-25T07:44:34Z

It should be like this

OmarIthawi · 2024-06-25T13:35:35Z

That's a bumper, a pretty bad one. Thanks for checking @volodymyr-chekyrta.

I'll study the problem more and get back to you. I'm not ready to give up yet 😅

OmarIthawi · 2024-07-20T16:30:18Z

@brian-smith-tcril @volodymyr-chekyrta Hello again! I think this pull request is ready for merge.

Please take a look and let me know if you have any notes or questions.

volodymyr-chekyrta · 2024-07-25T07:52:21Z

@brian-smith-tcril @volodymyr-chekyrta Hello again! I think this pull request is ready for merge.

Please take a look and let me know if you have any notes or questions.

Hi @OmarIthawi, sorry for the delay, I'll check it now

volodymyr-chekyrta · 2024-07-25T08:09:46Z

@OmarIthawi, the very last thing, and we are good to go.
Could you please remove this file as well:
https://github.com/Zeit-Labs/openedx-app-ios-contrib/blob/remove-uk/OpenEdX/uk.lproj/Localizable.strings

And then add it during the make pull_translations script.

This file is empty, but this is the way to tell the system that we support that language
https://github.com/user-attachments/assets/f54610ad-cc81-47cc-a5f3-57aee4bea7d5

Thank you 🙏

OmarIthawi · 2024-07-25T08:20:53Z

Thanks @volodymyr-chekyrta, I'll do that.

volodymyr-chekyrta · 2024-08-06T13:20:28Z

@OmarIthawi, could you please tell me if PR is ready for the final pass?
I still see the uk file at OpenEdX/uk.lproj/Localizable.strings

OmarIthawi · 2024-08-07T13:08:09Z

Not ready yet @volodymyr-chekyrta. Still working on the last bit. Marked as draft accordingly.

…lations`

OmarIthawi · 2024-08-08T14:57:28Z

@volodymyr-chekyrta, it's currently ready for testing.

I've used git diffs and it seemed okay. Please let me know if it looks good in XCode.

I see that we're still missing plurals and countries.json localization. So, let's see what can we improve and whether XCStrings would be used eventually after this pull request is merged 😅

volodymyr-chekyrta

LGTM 👍

OmarIthawi · 2024-08-10T09:48:52Z

Thanks @volodymyr-chekyrta for the review.

I don't have merge access, I appreciate a merge to avoid future git conflics.

openedx-webhooks · 2024-08-19T07:23:04Z

@OmarIthawi 🎉 Your pull request was merged! Please take a moment to answer a two question survey so we can improve your experience in the future.

openedx-webhooks added the open-source-contribution PR author is not from Axim or 2U label Jun 13, 2024

OmarIthawi requested review from rnr, brian-smith-tcril and volodymyr-chekyrta June 13, 2024 21:09

OmarIthawi force-pushed the remove-uk branch from d988cde to 3de09a2 Compare June 13, 2024 22:30

OmarIthawi changed the title ~~chore: clean up in-code uk translations~~ chore: clean up in-code uk translations | FC-55 Jun 14, 2024

mphilbrick211 added the waiting on author PR author needs to resolve review requests, answer questions, fix tests, etc. label Jun 20, 2024

OmarIthawi added help wanted Ready to be picked up by anyone in the community and removed waiting on author PR author needs to resolve review requests, answer questions, fix tests, etc. labels Jun 20, 2024

OmarIthawi force-pushed the remove-uk branch 3 times, most recently from d38ef50 to 64c373c Compare June 21, 2024 14:41

OmarIthawi mentioned this pull request Jun 21, 2024

[BUG] Exception is thrown when finding productRef instead of fileRef kronenthaler/mod-pbxproj#352

Closed

OmarIthawi marked this pull request as draft June 22, 2024 02:15

OmarIthawi force-pushed the remove-uk branch 2 times, most recently from 2781be0 to d025d04 Compare June 23, 2024 11:40

OmarIthawi commented Jun 23, 2024

View reviewed changes

OmarIthawi mentioned this pull request Jul 7, 2024

fix: support adding and removing Localizable.strings file kronenthaler/mod-pbxproj#356

Draft

2 tasks

OmarIthawi force-pushed the remove-uk branch 2 times, most recently from 1bd7036 to 47ceec4 Compare July 20, 2024 16:28

OmarIthawi marked this pull request as ready for review July 20, 2024 16:29

OmarIthawi added waiting for eng review PR is ready for review. Review and merge it, or suggest changes. and removed help wanted Ready to be picked up by anyone in the community labels Jul 20, 2024

mphilbrick211 added FC Relates to an Axim Funded Contribution project and removed waiting for eng review PR is ready for review. Review and merge it, or suggest changes. labels Jul 30, 2024

OmarIthawi force-pushed the remove-uk branch from 47ceec4 to 5ede65d Compare August 4, 2024 17:33

OmarIthawi marked this pull request as draft August 7, 2024 13:07

feat: remove uk translations and sync xcode project after `pull_trans…

ee3853c

…lations`

OmarIthawi force-pushed the remove-uk branch from 2b26b07 to ee3853c Compare August 8, 2024 14:53

OmarIthawi marked this pull request as ready for review August 8, 2024 14:53

volodymyr-chekyrta approved these changes Aug 9, 2024

View reviewed changes

volodymyr-chekyrta merged commit 157ded7 into openedx:develop Aug 19, 2024
6 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chore: clean up in-code uk translations | FC-55 #465

chore: clean up in-code uk translations | FC-55 #465

OmarIthawi commented Jun 13, 2024

openedx-webhooks commented Jun 13, 2024 •

edited

Loading

volodymyr-chekyrta commented Jun 18, 2024

OmarIthawi commented Jun 20, 2024

volodymyr-chekyrta commented Jun 21, 2024 •

edited

Loading

OmarIthawi commented Jun 21, 2024 •

edited

Loading

volodymyr-chekyrta commented Jun 21, 2024

OmarIthawi commented Jun 21, 2024

volodymyr-chekyrta commented Jun 21, 2024

OmarIthawi commented Jun 21, 2024

OmarIthawi commented Jun 21, 2024

OmarIthawi commented Jun 22, 2024

OmarIthawi left a comment

OmarIthawi Jun 23, 2024

OmarIthawi Jun 23, 2024

volodymyr-chekyrta commented Jun 25, 2024

volodymyr-chekyrta commented Jun 25, 2024

OmarIthawi commented Jun 25, 2024

OmarIthawi commented Jul 20, 2024

volodymyr-chekyrta commented Jul 25, 2024

volodymyr-chekyrta commented Jul 25, 2024 •

edited

Loading

OmarIthawi commented Jul 25, 2024

volodymyr-chekyrta commented Aug 6, 2024

OmarIthawi commented Aug 7, 2024 •

edited

Loading

OmarIthawi commented Aug 8, 2024 •

edited

Loading

volodymyr-chekyrta left a comment •

edited

Loading

OmarIthawi commented Aug 10, 2024

openedx-webhooks commented Aug 19, 2024

chore: clean up in-code uk translations | FC-55 #465

chore: clean up in-code uk translations | FC-55 #465

Conversation

OmarIthawi commented Jun 13, 2024

openedx-webhooks commented Jun 13, 2024 • edited Loading

What's next?

🔘 Get product approval

🔘 Provide context

🔘 Get a green build

🔘 Let us know that your PR is ready for review:

Who will review my changes?

Where can I find more information?

When can I expect my changes to be merged?

volodymyr-chekyrta commented Jun 18, 2024

OmarIthawi commented Jun 20, 2024

volodymyr-chekyrta commented Jun 21, 2024 • edited Loading

OmarIthawi commented Jun 21, 2024 • edited Loading

volodymyr-chekyrta commented Jun 21, 2024

OmarIthawi commented Jun 21, 2024

volodymyr-chekyrta commented Jun 21, 2024

OmarIthawi commented Jun 21, 2024

OmarIthawi commented Jun 21, 2024

Option 1: Use xcString files

Option 2: Automate adding the files

OmarIthawi commented Jun 22, 2024

OmarIthawi left a comment

Choose a reason for hiding this comment

OmarIthawi Jun 23, 2024

Choose a reason for hiding this comment

OmarIthawi Jun 23, 2024

Choose a reason for hiding this comment

volodymyr-chekyrta commented Jun 25, 2024

volodymyr-chekyrta commented Jun 25, 2024

OmarIthawi commented Jun 25, 2024

OmarIthawi commented Jul 20, 2024

volodymyr-chekyrta commented Jul 25, 2024

volodymyr-chekyrta commented Jul 25, 2024 • edited Loading

OmarIthawi commented Jul 25, 2024

volodymyr-chekyrta commented Aug 6, 2024

OmarIthawi commented Aug 7, 2024 • edited Loading

OmarIthawi commented Aug 8, 2024 • edited Loading

volodymyr-chekyrta left a comment • edited Loading

Choose a reason for hiding this comment

OmarIthawi commented Aug 10, 2024

openedx-webhooks commented Aug 19, 2024

openedx-webhooks commented Jun 13, 2024 •

edited

Loading

volodymyr-chekyrta commented Jun 21, 2024 •

edited

Loading

OmarIthawi commented Jun 21, 2024 •

edited

Loading

volodymyr-chekyrta commented Jul 25, 2024 •

edited

Loading

OmarIthawi commented Aug 7, 2024 •

edited

Loading

OmarIthawi commented Aug 8, 2024 •

edited

Loading

volodymyr-chekyrta left a comment •

edited

Loading