-
-
Notifications
You must be signed in to change notification settings - Fork 530
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
Improve german translations and add some missing strings #1904
Conversation
2e06b43
to
978a26c
Compare
This PR takes the translations from statamic#1655 and accounts for the differences between high-german and swiss-german (e.g. ß -> ss). Additionally it adds support for so far hardwired strings in Blade and VueJs. It addresses the following issues from statamic#1697: 1. Link Existing Field or Fieldset - [X] Sorry, no matching options - [X] Button text 'Link' - [X] or - [X] Placeholder text 'eg. _hero' 2. Password Reset Mail\ I could not test this because could not convince Statamic to show me the german version of the Forgot Password page and send the german version of the email. I added the translations as described here: https://github.com/laravel/docs/pull/4239/files - [X] Hello - [X] Regards - [ ] If you're having trouble -> Was not able to translate this. 3. Reset password error message - [ ] The password must be at least 8 characters. 4. Getting started widget - [x] Please remember ... 5. Permissions - [x] Title 'Create a Role' - [x] 'role' in Learn more about… (But actually there should be only one 'Learn more about…' button?) - [ ] No message helper text in the section 'Updates' (also in the en version) -> **String should be added by a maintainer** - [ ] No message helper text in the section 'User' (also in the en version) -> **String should be added by a maintainer** 6. Groups - [x] Title 'Create a User Group' - [x] 'User group updated' message 7. Forms (Blocked by statamic#1896) - [ ] Title 'Create a Form' - [x] Button 'Add Email' - [ ] Recipient (To) - [ ] Sender (From) - [ ] Subject - [ ] Template 8. Choose a blueprint (Blocked by statamic#1896) - [ ] 0/1 selected 9. Error message (i.e. when leave required fields blank or use spaces when creating a folder) - [x] The given data was invalid 10. Globals - [x] Title 'Create a Global Set' 11. Configure global set - [x] Content Model 12. Taxonomy - [x] Title 'Create a Taxonomy' 13. Collections/Navigations - [x] 'Parent' field in the sidebar 14. Revisions - [x] Publish -> Placeholder "Choose..." - [ ] Is it possible somehow to localize the date in the revision history?\ **Question**: It is possible to pass a format string to MomentJS. The question is where should that format be stored? - [ ] Site-wide in `.env` - [ ] Per user in the user settings - [x] Flag 'Publish', 'Unpublish' and 'Revision' in the revision history 15. If entries can contain links ... - [x] First Child - [x] Entry 16. Dropdowns are often too narrow for german words - These are styling issues 17. Sidebar - [x] 'Sidebar' in live preview - [x] 'Sidebar' in tab-title (when the screen size is too narrow to place the sidebar on the right side) 18. Live Preview - [x] 'Choose…' in Responsive Dropdown 19. Edit Blueprint - [x] 'Main' Section - [x] 'linked fieldset' 20. Add fieldtype - [x] Text - [x] Media - [x] Relationship - [x] Structured - [x] Special - [x] Pickable - [x] All fieldtype names 21. Fieldtype: Conditions\ Did not address these, because I did not got the consequences when translating these. Will investigate this and might add this to an own PR. - [ ] equals - [ ] not - [ ] contains - [ ] contains_any - [ ] custom 22. Fieldtype: Validation - [x] Add rule 23. Fieldtype: Array - [x] Label (Optional) 24. Fieldtype: Date - [x] Single - [x] Multiple - [x] Range 25. Fieldtype: Link - [x] First Child - [x] Entry
978a26c
to
518550f
Compare
Is this ready for review? I see it was marked ready but then more stuff was pushed up. |
@jasonvarga From my side this is ready for review. |
Is #1655 still necessary after I merge this? |
This one addresses high-german translations while #1655 addresses swiss-german translations. While in pronouncing there are quite some differences in written language they are not so much differences but those which exists are significant. For example high-german uses the letter ß while swiss-german uses ss, in high-german its die E-Mail and in swiss-german das E-Mail. Additionally this PR extracted some hidden hardcoded strings, which would be not be translateble. So I would vote for merge both. |
I think you should merge both, given users will then have a choice between de-CH and de-DE. Back in statamic 1, we had 2 translations for Norwegian language and 2 for German (formal, informal). A good feature request for the future will be to give Statamic the capability to default to a main language before defaulting to English. Then, we could have de-CH default to de (= de-DE) if some strings are not translated or cannot be found, then to English if some more strings are not translated. One of your competitor did that for French a few years ago: fr-CA => fr (which was more complete) => en |
Thank you. Just confirming! |
Hi @jasonvarga, thanks for merging. |
Great work @jasonvarga. Thanks for merging this and my Dutch translation. Does this mean I can rerun the translator now and it will pick up the missing strings? |
This PR takes the translations from #1655 and accounts for the differences between high-german and swiss-german (e.g. ß -> ss).
Additionally it adds support for so far hardwired strings in Blade and VueJs.
It addresses the following issues from #1697:
Link Existing Field or Fieldset
Password Reset Mail
I could not test this because could not convince Statamic to show me the german version of the Forgot Password page and send the german version of the email. I added the translations as described here: https://github.com/laravel/docs/pull/4239/files
Reset password error message
Getting started widget
Permissions
Groups
Forms (Blocked by Error choosing a blueprint on a new Form #1896)
Choose a blueprint (Blocked by Error choosing a blueprint on a new Form #1896)
Error message (i.e. when leave required fields blank or use spaces when creating a folder)
Globals
Configure global set
Taxonomy
Collections/Navigations
Revisions
Question: It is possible to pass a format string to MomentJS. The question is where should that format be stored?
.env
If entries can contain links ...
Dropdowns are often too narrow for german words
Sidebar
Live Preview
Edit Blueprint
Add fieldtype
Fieldtype: Conditions
Did not address these, because I did not got the consequences when translating these. Will investigate this and might add this to an own PR.
Fieldtype: Validation
Fieldtype: Array
Fieldtype: Date
Fieldtype: Link