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

FIXED: Translations on the User Creation setup page #12447

Merged
merged 4 commits into from
Feb 22, 2023

Conversation

akemidx
Copy link
Collaborator

@akemidx akemidx commented Feb 2, 2023

Translations have been added to the rest of the Create User page

  • Bug fix (non a bug, but needed)

Checklist:

@what-the-diff
Copy link

what-the-diff bot commented Feb 2, 2023

  • Added a new language file for the user creation page.
  • Updated the view to use translations from that language file instead of hardcoded strings.

@snipe
Copy link
Owner

snipe commented Feb 2, 2023

This looks perfect - it's saying there are conflicts though?

@akemidx
Copy link
Collaborator Author

akemidx commented Feb 2, 2023

Oh, I think that the ending ]; was missing when i created the branch? maybe from my mistroking or typing? I am unsure, because it looked clean on my side when I submitted the PR. A glance at the 'resolve conflicts' makes it look liek it doesn't like that i moved that closing bracket? I don't have enough experience to really guess further.

@parent
@stop

{{-- Page content --}}
@section('content')

<p> This is the account information you'll use to access the site for the first time. </p>
<p>{{ trans('admin/user/general.create_user_page_explaination') }}</p>
Copy link
Owner

Choose a reason for hiding this comment

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

This is a small detail, but I think there's a typo in this key - "explaination" vs "explanation"

@snipe
Copy link
Owner

snipe commented Feb 16, 2023

Ping! I'd love to get this into v6.1.0. <3

@akemidx
Copy link
Collaborator Author

akemidx commented Feb 17, 2023

should be all set

Copy link
Contributor

@svpernova09 svpernova09 left a comment

Choose a reason for hiding this comment

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

Looks good from here.

@snipe snipe merged commit 942fee4 into snipe:develop Feb 22, 2023
@akemidx akemidx deleted the user_setup_translation branch April 23, 2024 19:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants