Skip to content
This repository has been archived by the owner on Jun 21, 2022. It is now read-only.

Added German translation for TopicBox macro #235

Merged
merged 1 commit into from
Aug 8, 2017

Conversation

SebastianZ
Copy link
Contributor

No description provided.

@SebastianZ SebastianZ changed the title Added German translation for TopicBox-Macro Added German translation for TopicBox macro Jul 12, 2017
Copy link
Contributor

@jwhitlock jwhitlock left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@SebastianZ thanks for translating these strings. Looking at the French translation, I think the URLs should change from en-US to de as well.

@@ -66,6 +66,12 @@ ircLink = "<a href='irc://irc.mozilla.org/" + ircChannelName + "'>#" + ircChanne
// Generate localized strings

switch(env.locale) {
case "de": // German
headingStr = "Hilf dem '" + $0 + "'-Dokumentationsprojekt…";
statusStr = "Schau dir den aktuellen <a href='/en-US/docs/" + driver.docStatus + "'>Status</a> der '" + $0 +"'-Dokumentation an.";
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should the URL be ``/de/docs/"?

case "de": // German
headingStr = "Hilf dem '" + $0 + "'-Dokumentationsprojekt…";
statusStr = "Schau dir den aktuellen <a href='/en-US/docs/" + driver.docStatus + "'>Status</a> der '" + $0 +"'-Dokumentation an.";
topicDriverStr = "Bereichsverantwortlicher: <a href='/en-US/profiles/" + driver.mdnPseudo + "'>" + driver.name + "</a> (IRC-Nickname: " + driver.ircPseudo + ")";
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should the URL be '/de/profiles/'?

@Elchi3 Elchi3 assigned Elchi3 and SebastianZ and unassigned Elchi3 Jul 24, 2017
@SebastianZ
Copy link
Contributor Author

Sorry for the long delay on this one! I've changed the URLs of all localizations to the localized ones.

Sebastian

Copy link
Member

@Elchi3 Elchi3 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

r+

Copy link
Contributor

@jwhitlock jwhitlock left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @SebastianZ! Much better now, and I'm glad you figured out the rebase to make the PR commits sane.

@jwhitlock jwhitlock merged commit 2520131 into master Aug 8, 2017
jwhitlock added a commit to mdn/kuma that referenced this pull request Aug 8, 2017
* mdn/kumascript#235 - TopicBox: Add de translation
* mdn/kumascript#271 - GroupData: Update WebVR sidebar
* mdn/kumascript#275 - Move mozilla/kumascript to mdn/kumascript
* mdn/kumascript#277 - EmbedInteractiveExample: Update URL
* mdn/kumascript#278 - GroupData: Add Nav.mediaDevices.getUserMedia
* mdn/kumascript#280 - Spec2: Mark SIMD Obsolete
jwhitlock added a commit to mdn/kuma that referenced this pull request Aug 8, 2017
* mdn/kumascript#235 - TopicBox: Add de translation
* mdn/kumascript#271 - GroupData: Update WebVR sidebar
* mdn/kumascript#275 - Move mozilla/kumascript to mdn/kumascript
* mdn/kumascript#277 - EmbedInteractiveExample: Update URL
* mdn/kumascript#278 - GroupData: Add Nav.mediaDevices.getUserMedia
* mdn/kumascript#280 - Spec2: Mark SIMD Obsolete
@SebastianZ
Copy link
Contributor Author

I'm glad you figured out the rebase to make the PR commits sane.

Actually, I failed to do the rebase, because after rebasing I had plenty of unrelated commits, which came from the master branch. (I'd be happy if someone could explain me how that could happen.)

So I exported my changes into patches, deleted the local branch, recreated it, applied the patches, committed and force-pushed them.

Sebastian

@jwhitlock jwhitlock deleted the topicbox-de-translation branch August 9, 2017 23:29
@jwhitlock
Copy link
Contributor

@SebastianZ if you get into this situation again, get in touch with me. I can figure out what happened if you still have the commands you ran and their output, but I have no guesses why a rebase would go so badly.

OK, maybe one guess. git pull does the right thing 80% of the time, and messes things up the other 20%. You can avoid the 20% with some extra configuration:

https://stackoverflow.com/questions/15316601/in-what-cases-could-git-pull-be-harmful#15316602

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants