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

Brand new de-CH translation #1655

Merged
merged 9 commits into from
Jul 2, 2020
Merged

Brand new de-CH translation #1655

merged 9 commits into from
Jul 2, 2020

Conversation

helloDanuk
Copy link
Contributor

@helloDanuk helloDanuk commented Apr 9, 2020 •
edited
Loading

What started as an project to reflect some minor differences in de-CH ended in a complete overhaul of the de translation itself. We had a discussion in the german Discord channel. We agree that de and de-CH should be the same, besides the differences in grammar. The feedback in general was positive, no opposition, so here we are:

This PR contains the de-CH version only with all additions to the translation files Jack made in the last couple of days. Great work! I propose to finish it first, before we duplicate it back to a de version and change the grammar (mostly add the ß character). We then do not need to make all changes twice. On the other hand it would be great to get a overhauled de version out to the wild soon. So that everybody can notice the changes.

There are a few toughts about the translation here (in german):

As for issue #1640 (Update 18.4.2020: I cleaned up messages.php, see comment below.): I copied all these lines manually to the new de-CH translation in this PR. The messages.php contains a match of both (all english textfragments and the three additions in the generated file). This needs to be sorted out in one of the next beta-versions.

@helloDanuk helloDanuk marked this pull request as draft April 17, 2020 10:50
@helloDanuk helloDanuk marked this pull request as ready for review April 18, 2020 12:21
@helloDanuk
Copy link
Contributor Author

helloDanuk commented Apr 18, 2020 •
edited
Loading

I have improved the translation in several places and updated it to beta.26. Further I cleaned up messages.php and deleted some leftovers from an earlier beta version. As far as I tested, they are not used anymore. Further I have add some keys manually ('Create a…'-titles in *.json file and the last two lines in fieldtypes.php).

Some missing translations are marked in #1697 and there is a bug(?) with plural form #1695. Apart from that the translated CP looks really good now! Although I couldn't test multisite. This should help non-native English-speaking editors to feel more comfortable in the CP.

I am not sure, if I should copy the new translation to the de version now? Some feedback from german users would be great.

@helloDanuk helloDanuk mentioned this pull request Apr 18, 2020
Closed
@Konafets
Copy link
Contributor

Konafets commented Jun 6, 2020

@helloDanuk I noticed that the german labels are sometimes a bit cumbersome. I will copy your swiss-german translations to german and will adjust where I think it makes sense.

Additionally I startet adding support for some untranslatable strings in the VueJS files from #1697

@Konafets Konafets mentioned this pull request Jun 7, 2020
Merged
58 tasks
@helloDanuk helloDanuk mentioned this pull request Jun 8, 2020
Closed
Konafets added a commit to Konafets/cms that referenced this pull request Jun 10, 2020
@Konafets
Improve german translations and add some missing strings
518550f 
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
@helloDanuk
Copy link
Contributor Author

I just checked with beta.32: there are no new or changed translation strings. The PR should still be up to date.

@jasonvarga
Copy link
Member

Thank you! I will be reviewing all the translation PRs soon.

@helloDanuk
Copy link
Contributor Author

Could test multi-site in the CP and then unified some wordings.

@jasonvarga
Copy link
Member

Does this still need to be merged if #1904 is merged?

@jasonvarga jasonvarga merged commit 347981f into statamic:master Jul 2, 2020
@helloDanuk
Copy link
Contributor Author

I agree with the comments made in #1904. Thanks for merging!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@helloDanuk @Konafets @jasonvarga