mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-07-26 03:01:22 +02:00
Code Issues Releases Wiki Activity

Extract translations from core blade files.

Browse Source 
- Extracts translations from `reset.blade.php`.
- Adjusts namespacing of translations in other files.
- Fixes one direct reference to a `core.ref` key.
This commit is contained in:
dcsjapan
2016-04-07 17:45:58 +09:00
parent b2c96a1b16
commit e5bc25f586
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
framework/core/views/content.blade.php
View File

@@ -1,14 +1,14 @@
<div id="flarum-loading" style="display: none"> <div id="flarum-loading" style="display: none">
{{ $translator->trans('core.basic.loading_text') }} {{ $translator->trans('core.views.content.loading_text') }}
</div> </div>
@if (! $noJs) <noscript> @endif @if (! $noJs) <noscript> @endif
<div class="Alert"> <div class="Alert">
<div class="container"> <div class="container">
@if ($noJs) @if ($noJs)
{{ $translator->trans('core.basic.load_error_message') }} {{ $translator->trans('core.views.content.load_error_message') }}
@else @else
{{ $translator->trans('core.basic.javascript_disabled_message') }} {{ $translator->trans('core.views.content.javascript_disabled_message') }}
@endif @endif
</div> </div>
</div> </div>

4
framework/core/views/discussion.blade.php
View File

@@ -20,10 +20,10 @@ $postsCount = count($discussion->relationships->posts->data);
</div> </div>
@if ($page > 1) @if ($page > 1)
<a href="{{ $url(['page' => $page - 1]) }}">&laquo; {{ $translator->trans('core.basic.previous_page_button') }}</a> <a href="{{ $url(['page' => $page - 1]) }}">&laquo; {{ $translator->trans('core.views.discussion.previous_page_button') }}</a>
@endif @endif
@if ($page < $postsCount / 20) @if ($page < $postsCount / 20)
<a href="{{ $url(['page' => $page + 1]) }}">{{ $translator->trans('core.basic.next_page_button') }} &raquo;</a> <a href="{{ $url(['page' => $page + 1]) }}">{{ $translator->trans('core.views.discussion.next_page_button') }} &raquo;</a>
@endif @endif
</div> </div>

4
framework/core/views/index.blade.php
View File

@@ -2,7 +2,7 @@
$url = app('Flarum\Forum\UrlGenerator'); $url = app('Flarum\Forum\UrlGenerator');
?> ?>
<div class="container"> <div class="container">
<h2>{{ $translator->trans('core.ref.all_discussions') }}</h2> <h2>{{ $translator->trans('core.views.index.all_discussions_heading') }}</h2>
<ul> <ul>
@foreach ($document->data as $discussion) @foreach ($document->data as $discussion)
@@ -16,5 +16,5 @@ $url = app('Flarum\Forum\UrlGenerator');
@endforeach @endforeach
</ul> </ul>
<a href="{{ $url->toRoute('index') }}?page={{ $page + 1 }}">{{ $translator->trans('core.basic.next_page_button') }} &raquo;</a> <a href="{{ $url->toRoute('index') }}?page={{ $page + 1 }}">{{ $translator->trans('core.views.index.next_page_button') }} &raquo;</a>
</div> </div>

8
framework/core/views/reset.blade.php
View File

@@ -9,24 +9,24 @@
</head> </head>
<body> <body>
<h1>Reset Your Password</h1> <h1>{{ $translator->trans('core.views.reset.title') }}</h1>
<form class="form-horizontal" role="form" method="POST" action="{{ app('Flarum\Forum\UrlGenerator')->toRoute('savePassword') }}"> <form class="form-horizontal" role="form" method="POST" action="{{ app('Flarum\Forum\UrlGenerator')->toRoute('savePassword') }}">
<input type="hidden" name="csrfToken" value="{{ $csrfToken }}"> <input type="hidden" name="csrfToken" value="{{ $csrfToken }}">
<input type="hidden" name="passwordToken" value="{{ $passwordToken }}"> <input type="hidden" name="passwordToken" value="{{ $passwordToken }}">
<div class="form-group"> <div class="form-group">
<label class="control-label">Password</label> <label class="control-label">{{ $translator->trans('core.views.reset.password_label') }}</label>
<input type="password" class="form-control" name="password"> <input type="password" class="form-control" name="password">
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="control-label">Confirm Password</label> <label class="control-label">{{ $translator->trans('core.views.reset.confirm_password_label') }}</label>
<input type="password" class="form-control" name="password_confirmation"> <input type="password" class="form-control" name="password_confirmation">
</div> </div>
<div class="form-group"> <div class="form-group">
<button type="submit" class="btn btn-primary">Reset Password</button> <button type="submit" class="btn btn-primary">{{ $translator->trans('core.views.reset.submit_button') }}</button>
</div> </div>
</form> </form>
</body> </body>