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

Refactor translations #3441

Merged
merged 17 commits into from
May 6, 2023
Merged

Refactor translations #3441

merged 17 commits into from
May 6, 2023

Conversation

jaapmarcus
Copy link
Member

@jaapmarcus jaapmarcus commented Apr 5, 2023 •
edited

  • Add support for basic "White label" Add White label options to Hestia CP #2493
  • Replace for example "ACCOUNT_READY" With the current translation. We might want to tweak them
  • Updated translations where English was different from source for example: Editing web domain replaced by Edit web domain
  • Dropped .mo for English
  • From email and name are changeable by user via settings (Form doesn't exists yet)
  • Removed all "Hestia Control Panel" text with %s. Except on /edit/server. There it is converted to hardcoded
  • Option to hide docs
  • Allow user to use custom templates for email (Fully editable and available in any supported languages
  • Change / Update Subject of said emails
  • Alter / change title

@jaapmarcus jaapmarcus force-pushed the refactor-translation-strings branch from ad4c835 to 5942480 Compare April 7, 2023 07:32
@myrevery
Copy link
Contributor

@jaapmarcus Do we have an ETA?

@jaapmarcus jaapmarcus force-pushed the refactor-translation-strings branch 5 times, most recently from 33a8d07 to 00d6885 Compare April 19, 2023 21:33
@jaapmarcus jaapmarcus marked this pull request as ready for review April 26, 2023 22:19
@jaapmarcus
Copy link
Member Author

jaapmarcus commented Apr 26, 2023 •
edited

Have decided to drop "logo" changing / update support. The system I implemented was not great and still had issues.

PR will very soon a merge hell and it would be useful to allow the "community" to start on translation work...

This was linked to issues Apr 26, 2023
[FEATURE] Make HESTIA panel's email templates customizable / translatable #1606
Closed
Add White label options to Hestia CP #2493
Closed
@jaapmarcus
Copy link
Member Author

Screenshot 2023-04-27 at 00 28 22

@myrevery
Copy link
Contributor

@jaapmarcus Request hold on the merge.

After reviewing all changes, some typos and missing strings were found.

If you accept, I'll make a PR to the "refactor-translation-strings" branch by next week, agree?

@jaapmarcus
Copy link
Member Author

Please go ahead :)

jaapmarcus and others added 3 commits April 27, 2023 21:02
@jaapmarcus
Refactor translation
c822176 
- Refactor translations
- Add support for Whitelabeling (Logo's will come in other PR)
- Add support for changing email templates
- Removed copy javascript email credentials to  hidden input.
@AlecRust @jaapmarcus
Tidy
6a89335
@AlecRust @jaapmarcus
Fix spelling
f6765b9
@jaapmarcus
Remove multiple php errors
6e0f7ba 
Fix: php error Undefined variable $error
Remove: Undefined variable $v_record_id
Remove: Undefined variable $status
Also removed unused from form: murmur hasn't been used for a long time...
@jaapmarcus jaapmarcus mentioned this pull request Apr 27, 2023
Closed
@jaapmarcus jaapmarcus linked an issue Apr 27, 2023 that may be closed by this pull request
[Bug] nginx-error.log get spammed with Undefined variable #3359
Closed
jaapmarcus and others added 3 commits April 28, 2023 16:00
@jaapmarcus
Fix error message v-change-web-docroot
6f469a5
@AlecRust
Merge branch 'main' into refactor-translation-strings
f1c2c23 
* main:
  Refactor JS (#3508)
  #3318 Remove: decrepitation warning MariaDB (#3465)
  Kill OpenSSL server if its already running before validating SSL certificate (#3505)

# Conflicts:
#	web/js/dist/main.min.js
#	web/js/dist/main.min.js.map
#	web/templates/pages/edit_web.php
@jaapmarcus
Fix label DNS records
3c0fc2c
AlecRust and others added 4 commits April 29, 2023 19:37
@AlecRust
Merge branch 'main' into refactor-translation-strings
f25d91f 
* main:
  Refactor Add/Edit Database JS (#3511)
  UI updates (#3510)

# Conflicts:
#	web/js/dist/main.min.js
#	web/js/dist/main.min.js.map
#	web/js/src/copyCreds.js
#	web/templates/includes/js.php
#	web/templates/pages/add_key.php
@myrevery
Improve "Refactor translations" (#3512)
a651fe6
@jaapmarcus
Use sprintf instead gettext twice
add7fd4 
Allows translators to format Every 2 days.

For month tab replace: "Date" with "Day"
@jaapmarcus
Merge branch 'main' into refactor-translation-strings
147e7e1
@jaapmarcus
Copy link
Member Author

Will merge it "tomorrow" and prepare https://translate.hestiacp.com/projects/hestiacp-1.8/ to be translated

@myrevery
Copy link
Contributor

myrevery commented May 1, 2023

Still have to wait...

After testing the scan, it looks like there are still a lot of strings that need to be cleaned up.

@jaapmarcus
Copy link
Member Author

Still have to wait...

After testing the scan, it looks like there are still a lot of strings that need to be cleaned up.

The main issue for now any changes in the main branch on the "Web" page will cause merge conflict hell ..

Really want to prevent this kind of *** if possible.

Have synced up the current .pot file with https://translate.hestiacp.com/projects/hestiacp-1.8/

@myrevery
Copy link
Contributor

myrevery commented May 1, 2023

I'll finish it ASAP...

@myrevery
Copy link
Contributor

myrevery commented May 1, 2023

@jaapmarcus #3523 is ready to merge.

I noticed a lot of strings on GlotPress link to legacy "*.html" templates.

Seems like you need to clean up your dev machine before scanning.

myrevery and others added 5 commits May 2, 2023 20:14
@myrevery @jaapmarcus
Another fixes to "Refactor translations (#3441)" (#3523)
c2be5f7 
* Another fixes to "Refactor translations"

* Final adjustments

* Fix syntax error

* Revert wrong changes

* Revert "Revert wrong changes"

This reverts commit 4e45424.

* Convert {text} to <b>text</b>

Also remove hardcode color from template in add access key

* Fix typos

---------

Co-authored-by: Jaap Marcus <9754650+jaapmarcus@users.noreply.github.com>
@jaapmarcus
Merge branch 'main' into refactor-translation-strings
2ee2a2f
@jaapmarcus
Merge remote-tracking branch 'origin/main' into refactor-translation-…
8b6c587 
…strings
@jaapmarcus
Merge branch 'main' into refactor-translation-strings
a85a911
@jaapmarcus
Merge remote-tracking branch 'origin/main' into refactor-translation-…
afaebed 
…strings
@jaapmarcus jaapmarcus merged commit 4df60ba into main May 6, 2023
6 checks passed
@jaapmarcus jaapmarcus deleted the refactor-translation-strings branch May 6, 2023 06:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AlecRust AlecRust AlecRust approved these changes

@ScIT-Raphael ScIT-Raphael Awaiting requested review from ScIT-Raphael

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
3 participants
@jaapmarcus @myrevery @AlecRust