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.

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

Updated translations #725

Merged
merged 2 commits into from
Jun 26, 2017
Merged

Updated translations #725

merged 2 commits into from
Jun 26, 2017

Conversation

splitt3r
Copy link
Contributor

@splitt3r splitt3r commented Jun 3, 2017

Updated german translations and moved some texts to the translation files. @lcharette could you also update the french files? @abdullahseba and you the arab ones?

@abdullahseba
Copy link
Contributor

abdullahseba commented Jun 3, 2017 via email

@splitt3r
Copy link
Contributor Author

splitt3r commented Jun 3, 2017

In app/sprinkles/account/locale/*/messages.php:

  • SESSION_COMPROMISED.TEXT (SESSION_COMPROMISED is an array now)
  • CREATE
  • CREATE.PAGE
  • CREATE.SET
  • SIGN_IN_HERE

In app/sprinkles/admin/locale/*/messages.php:

  • NO_FEATURES_YET

In app/sprinkles/core/locale/*/messages.php:

  • PAGINATION.NEXT
  • PAGINATION.PREVIOUS
  • PAGINATION.FIRST
  • PAGINATION.LAST
  • LEGAL.DESCRIPTION (LEGALis an array now)
  • PRIVACY.DESCRIPTION (PRIVACY is an array now)
  • WELCOME_TO

That should by all from my changes 😀 but there are also some strings added recently from alex etc. for exampe in app/sprinkles/core/locale/en_US/validation.php the SPRUNJE.* strings. The you can use the https://github.com/userfrosting/LanguageUtility or start by comparing the line numbers of the files.

@abdullahseba
Copy link
Contributor

Thanks! will try to do it soon.

@alexweissman
Copy link
Member

Thanks! This can be merged in a hotfix.

<p class="login-box-msg"><strong>Create Password</strong></p>
<p class="login-box-msg">Welcome to {{site.title}}! Please create a password for your new account.</p>
<p class="login-box-msg"><strong>{{translate("PASSWORD.CREATE")}}</strong></p>
<p class="login-box-msg">{{translate("WELCOME_TO", {'title': site.title})}} {{translate("PASSWORD.CREATE.PAGE")}}</p>
Copy link
Member

Choose a reason for hiding this comment

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

Would this be a good spot to use compound i18n keys? PASSWORD.CREATE.PAGE could reference the WELCOME_TO key.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sounds good :) will try that

<p>
It doesn't look like any features have been set up for this account...yet. Maybe they haven't been implemented yet, or maybe someone forgot to give you access. Either way, we're glad to have you aboard!
{{translate("NO_FEATURES_YET")}}
Copy link
Member

Choose a reason for hiding this comment

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

Not sure this need translating, at least not in core sprinkles where the key will stay forever. This sentence will be changed by devs in 95% of cases maybe...

@abdullahseba
Copy link
Contributor

Updated mine (I think) hope I did it right....

@@ -82,7 +82,7 @@
<button type="submit" class="btn btn-block btn-primary">{{translate('REGISTER_ME')}}</button>
</div>
<div style="padding-top: 10px;">
Already have an account? <a href="{{site.uri.public}}/account/sign-in">Sign in here.</a>
{{translate('SIGN_IN_HERE', {'url' : '#{site.uri.public}/account/sign-in'}) | raw}}
Copy link
Member

Choose a reason for hiding this comment

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

This doesn't seem to work properly.

@alexweissman alexweissman merged commit 0b5601f into userfrosting:develop Jun 26, 2017
@splitt3r splitt3r deleted the fix-translations branch August 6, 2017 12:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants