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.

Sign up for GitHub

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

Jump to bottom

Merge locale folders to locale code folders #8598

Closed
defstat opened this issue Feb 2, 2023 · 11 comments
Closed

Merge locale folders to locale code folders #8598

defstat opened this issue Feb 2, 2023 · 11 comments
Assignees
@defstat @pkp-dev-infrastructure
Labels
Housekeeping:1:Todo Any dependency management or refactor that would be nice to have some day.
Milestone
3.4.0-0 Internal

Comments

@defstat
Copy link
Collaborator

defstat commented Feb 2, 2023 •
edited
Loading

For example there are es_ES and es_MX folders in the installation. Consider a solution/process that would merge them to an es locale code folder.

Changes need to be made to

  1. the filesystem regarding the translation .po files, and their respective folders.
  2. the DB, regarding the data that directly correspond and manage the installation's locale
  3. the base code, where ever certain affected locales are hard coded

PRs

FOR MERGE
OJS: pkp/ojs#3774 (Alec: Additions made here pkp/ojs#3775) (merged ✔️)
OMP: pkp/omp#1344 (merged ✔️)
OPS: pkp/ops#478 (merged ✔️)
PKP-LIB: #8649 (Alec: Additions made here #8650) (merged ✔️)
UI-LIBRARY: pkp/ui-library#261 (merged ✔️)
staticPages: pkp/staticPages#74 (merged ✔️)

ADDITIONAL PRs
OJS: pkp/ojs#3779 TESTS ONLY
pkp-lib: #8654 (merged ✔️)
pkp-lib: #8658 (merged ✔️)

PLUGINS
plagiarism : pkp/plagiarism#41
paperbuzz : pkp/paperbuzz#27
textEditorExtras : pkp/textEditorExtras#18 (merged ✔️)
JATSParser : Vitaliy-1/JATSParserPlugin#82 (merged ✔️)
googleAnalytics: pkp/googleAnalytics#56 (merged ✔️)
browseBySection: pkp/browseBySection#34 (merged ✔️)
returningAuthorScreening : pkp/returningAuthorScreening#2 (merged ✔️)
subscriptionSSO: asmecher/subscriptionSSO#12 (merged ✔️)
controlPublicFiles : pkp/controlPublicFiles#9 (merged ✔️)

pln: pkp/pln#62 (merged ✔️)
pdfJsViewer: pkp/pdfJsViewer#65 (merged ✔️)
crossref : pkp/crossref-ojs#28 (merged ✔️)
oaijats: pkp/oaiJats#34 (merged ✔️)
makesubmission : pkp/makeSubmission#35 (merged ✔️)
medra : pkp/medra#8 (merged ✔️)
lensGalley : asmecher/lensGalley#63 (merged ✔️)
jatsTemplate : pkp/jatsTemplate#23 (merged ✔️)
immersion : pkp/immersion#84 (merged ✔️)
hypothesis : asmecher/hypothesis#21 (merged ✔️)
googleScholar : pkp/googleScholar#13 (merged ✔️)
defaultTranslation : pkp/defaultTranslation#12 (merged ✔️)
customLocale : pkp/customLocale#22 (merged ✔️)
customHeader : pkp/customHeader#27 (merged ✔️)
customBlockManager : pkp/customBlockManager#75 (merged ✔️)
classic: pkp/classic#112 (merged ✔️)
citationStyleLanguage : pkp/citationStyleLanguage#104 (merged ✔️)
coins : pkp/coins#9 (merged ✔️)
browse : pkp/browse#12 (merged ✔️)
backup : asmecher/backup#7 (merged ✔️)
pragma : pkp/pragma#91 (merged ✔️)
quickSubmit: pkp/quickSubmit#68 (merged ✔️)
reviewReport : pkp/reviewReport#46 (merged ✔️)
swordServer: pkp/swordServer#3 (merged ✔️)
texture: pkp/texture#116 (merged ✔️)
tinymce: pkp/tinymce#88 (merged ✔️)
usageStats : pkp/usageStats#55 (merged ✔️)
addThis: pkp/addThis#27 (merged ✔️)
piwik : pkp/piwik#15 (merged ✔️)
sword : pkp/sword#33 (merged ✔️)
registrationNotification : pkp/registrationNotification#10 (merged ✔️)
orcidProfile : pkp/orcidProfile#238 (merged ✔️)
crossref-ops: pkp/crossref-ops#25 (merged ✔️)

Script Actions
outputProcessOJS.txt
outputProcessOMPOPS.txt
@defstat defstat self-assigned this Feb 2, 2023
defstat added a commit to defstat/LocaleMigrationTools that referenced this issue Feb 6, 2023
@defstat
pkp/pkp-lib#8598 Several fixes
1685045
@NateWr NateWr added the Housekeeping:1:Todo Any dependency management or refactor that would be nice to have some day. label Feb 9, 2023
defstat added a commit to defstat/ojs that referenced this issue Feb 9, 2023
@defstat
pkp/pkp-lib#8598 Code Base locale changes
e1d2553
defstat added a commit to defstat/ojs that referenced this issue Feb 9, 2023
@defstat
pkp/pkp-lib#8598 DB Migration changes
0b25074
defstat added a commit to defstat/ojs that referenced this issue Feb 9, 2023
@defstat
pkp/pkp-lib#8598 LOCALE FILES CHANGES
8fb841a
defstat added a commit to defstat/ojs that referenced this issue Feb 10, 2023
@defstat
pkp/pkp-lib#8598 MERGED LOCALE FILES FOR REVIEW
dd90e4c
defstat added a commit to defstat/pkp-lib that referenced this issue Feb 10, 2023
@defstat
pkp#8598 Code Base locale changes
2b6427c
defstat added a commit to defstat/pkp-lib that referenced this issue Feb 10, 2023
@defstat
pkp#8598 DB Migration changes
70bb4af
defstat added a commit to defstat/pkp-lib that referenced this issue Feb 10, 2023
@defstat
pkp#8598 MERGED LOCALE FILES FOR REVIEW
7945bc0
defstat added a commit to defstat/staticPages that referenced this issue Feb 10, 2023
@defstat
pkp/pkp-lib#8598 MERGED LOCALE FILES FOR REVIEW
af1514b
@defstat
Copy link
Collaborator Author

defstat commented Feb 10, 2023

@asmecher here are the draft PRs containing the merged locale files for review

OJS: pkp/ojs#3754
pkp-lib: #8621

plugins
staticPages: pkp/staticPages#71

I found some issues in the DB migration and still working on that.

defstat added a commit to defstat/ojs that referenced this issue Feb 13, 2023
@defstat
pkp/pkp-lib#8598 Migration Fixes
54e5402
defstat added a commit to defstat/pkp-lib that referenced this issue Feb 13, 2023
@defstat
pkp#8598 Migration Fixes
12c0818
defstat added a commit to defstat/pkp-lib that referenced this issue Feb 13, 2023
@defstat
pkp#8598 Migration Fixes
d1c60dd
defstat added a commit to defstat/pkp-lib that referenced this issue Feb 13, 2023
@defstat
pkp#8598 Remove zh_Hant from the list
8b500b1
@asmecher
Copy link
Member

asmecher commented Feb 14, 2023 •
edited
Loading

Thanks, @defstat! This needs a few things...

  • Please check on the DOS line endings noted here (but presumably affecting all repos)
  • Please port the code changes to OMP and OPS and open PRs for those (don't worry about committing a sample conversion just yet -- reviewing the results of the merge on OJS, pkp-lib and staticPages repos are enough for now);
  • I've added a few comments to 2b6427c, 70bb4af, and [pkp-lib][main] #8598 MERGED LOCALE FILES FOR REVIEW #8621 (comment) that could use a look

defstat added a commit to defstat/pkp-lib that referenced this issue Feb 14, 2023
@defstat
pkp#8598 Code Base locale changes
ace3edb 
(cherry picked from commit 2b6427c)
defstat added a commit to defstat/pkp-lib that referenced this issue Feb 14, 2023
@defstat
pkp#8598 DB Migration changes
be9f10d
defstat added a commit to defstat/omp that referenced this issue Feb 14, 2023
@defstat
pkp/pkp-lib#8598 DB Migration added
887c9c5
defstat added a commit to defstat/pkp-lib that referenced this issue Feb 14, 2023
@defstat
pkp#8598 DB Migration fix
3858e1c
defstat added a commit to defstat/ojs that referenced this issue Feb 14, 2023
@defstat
pkp/pkp-lib#8598 DB Migration changes
db6c02a
defstat added a commit to defstat/ops that referenced this issue Feb 14, 2023
@defstat
pkp/pkp-lib#8598 DB Migration added
ab97159
defstat added a commit to defstat/pkp-lib that referenced this issue Feb 14, 2023
@defstat
pkp#8598 Change journal to context in variable names
74f8eaa
defstat added a commit to defstat/pkp-lib that referenced this issue Feb 14, 2023
@defstat
pkp#8598 Migrate default values from en_US to en
d65f253
defstat added a commit to defstat/pkp-lib that referenced this issue Feb 14, 2023
@defstat
pkp#8598 Change value back to en_US for pre-3.3 specific file
8567901
defstat added a commit to defstat/ojs that referenced this issue Feb 14, 2023
@defstat
pkp/pkp-lib#8598 db Migration Changes
f80abdf
defstat added a commit to defstat/pkp-lib that referenced this issue Feb 14, 2023
@defstat
pkp#8598 db Migration Changes
d5d1475
defstat added a commit to defstat/omp that referenced this issue Feb 14, 2023
@defstat
pkp/pkp-lib#8598 db Migration Changes
adb9f75
asmecher pushed a commit to asmecher/hypothesis that referenced this issue Feb 17, 2023
@defstat
pkp/pkp-lib#8598 Locale Migration Changes (#21)
53a3368
asmecher pushed a commit to pkp/googleScholar that referenced this issue Feb 17, 2023
@defstat
pkp/pkp-lib#8598 Locale Migration Changes (#13)
7562fbe
asmecher pushed a commit to pkp/googleAnalytics that referenced this issue Feb 17, 2023
@defstat
pkp/pkp-lib#8598 Locale Migration Changes (#56)
85e03db
asmecher pushed a commit that referenced this issue Feb 17, 2023
@defstat @asmecher
#8598 funder_settings, funder_award_settings, static_page_settings ta…
84c5a17 
…bles added to migration
asmecher pushed a commit to pkp/customLocale that referenced this issue Feb 17, 2023
@defstat @asmecher
pkp/pkp-lib#8598 Locale Migration Changes
579c394
asmecher pushed a commit to pkp/customHeader that referenced this issue Feb 17, 2023
@defstat
pkp/pkp-lib#8598 Locale Migration Changes (#27)
74bc394
asmecher pushed a commit to pkp/browse that referenced this issue Feb 17, 2023
@defstat @asmecher
pkp/pkp-lib#8598 Locale Migration Changes
8be1ac9
asmecher pushed a commit to asmecher/backup that referenced this issue Feb 17, 2023
@defstat
pkp/pkp-lib#8598 Locale Migration Changes (#7)
b6a0c0f
asmecher pushed a commit to pkp/quickSubmit that referenced this issue Feb 17, 2023
@defstat
pkp/pkp-lib#8598 Locale Migration Changes (#68)
07f3bc3
asmecher pushed a commit to pkp/reviewReport that referenced this issue Feb 17, 2023
@defstat @asmecher
pkp/pkp-lib#8598 Locale Migration Changes
edb1b0b
asmecher pushed a commit to pkp/swordServer that referenced this issue Feb 17, 2023
@defstat
pkp/pkp-lib#8598 Locale Migration Changes (#3)
320aae8
asmecher pushed a commit to pkp/texture that referenced this issue Feb 17, 2023
@defstat
pkp/pkp-lib#8598 Locale Migration Changes (#116)
3f33eb5
asmecher pushed a commit to pkp/tinymce that referenced this issue Feb 17, 2023
@defstat @asmecher
pkp/pkp-lib#8598 Locale Migration Changes
dea8cbc
asmecher pushed a commit to pkp/usageStats that referenced this issue Feb 17, 2023
@defstat @asmecher
pkp/pkp-lib#8598 Locale Migration Changes
4496d9a
asmecher pushed a commit to pkp/addThis that referenced this issue Feb 17, 2023
@defstat @asmecher
pkp/pkp-lib#8598 Locale Migration Changes
57713d0
asmecher pushed a commit to pkp/controlPublicFiles that referenced this issue Feb 17, 2023
@defstat
pkp/pkp-lib#8598 Locale Migration Changes (#9)
75bc686
asmecher pushed a commit to pkp/piwik that referenced this issue Feb 17, 2023
@defstat
pkp/pkp-lib#8598 Locale Migration Changes (#15)
db13e14
asmecher pushed a commit to pkp/textEditorExtras that referenced this issue Feb 17, 2023
@defstat
pkp/pkp-lib#8598 Locale Migration Changes (#18)
0fd2e15
@asmecher
Copy link
Member

I think this one is finally completed!!!

asmecher added a commit that referenced this issue Feb 24, 2023
@asmecher
#8598 Clean up forgotten locale patterns
22e8533
asmecher added a commit to pkp/plugin-gallery that referenced this issue Feb 24, 2023
@asmecher
pkp/pkp-lib#8598 Add en locale data; make locale codes more flexible
91d0342
@kelynch
Copy link

kelynch commented Mar 1, 2023

We're currently on Open Journal Systems 3.3.0.8 and using the es_ES convention; do we need to upgrade OJS before we accept these new commits?

@asmecher
Copy link
Member

asmecher commented Mar 1, 2023

@kelynch, yes, these changes are for release in 3.4.0 and it would be a complicated process to port them back to 3.3.0. Is there a particular change you need in 3.3.0-8?

@bess bess mentioned this issue Mar 1, 2023
Open
3 tasks
@bess
Copy link

bess commented Mar 1, 2023

@asmecher I think we understand the issue and have a plan to move forward, thank you!

@asmecher
Copy link
Member

asmecher commented Mar 1, 2023

@bess, OK, thanks! Let me know if I can provide any further context for these changes.

@Vitaliy-1 Vitaliy-1 mentioned this issue Mar 9, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@defstat defstat

@pkp-dev-infrastructure pkp-dev-infrastructure

Labels
Housekeeping:1:Todo Any dependency management or refactor that would be nice to have some day.
Projects
Infrastructure
Status: Done
Milestone
3.4.0-0 Internal
Development

No branches or pull requests
6 participants
@bess @asmecher @defstat @NateWr @kelynch @pkp-dev-infrastructure