Skip to content

Commit 4499ae8

Browse files
ssddanbrownssddanbrown
committed
Made fixes to es languge files and users page
Fixed PHP formatting error in ES lang file and added tests to cover. Made user edit page more responsive on smaller devices. Fixed 'cancel' button on profile screen when the user does not have permission to manage users.
1 parent d4e790d commit 4499ae8

7 files changed

Lines changed: 70 additions & 51 deletions

File tree

‎resources/lang/es/activities.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
'page_update' => 'página actualizada',
1414
'page_update_notification' => 'Página actualizada exitosamente',
1515
'page_delete' => 'página borrada',
16-
'page_delete_notification' => 'Página borrada exitosamente,
16+
'page_delete_notification' => 'Página borrada exitosamente',
1717
'page_restore' => 'página restaurada',
1818
'page_restore_notification' => 'Página restaurada exitosamente',
1919
'page_move' => 'página movida',

‎resources/views/users/create.blade.php‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@
2121
<form action="{{ baseUrl("/settings/users/create") }}" method="post">
2222
{!! csrf_field() !!}
2323
@include('users/forms/' . $authMethod)
24+
<div class="form-group">
25+
<a href="{{ baseUrl($currentUser->can('users-manage') ? "/settings/users" : "/") }}" class="button muted">{{ trans('common.cancel') }}</a>
26+
<button class="button pos" type="submit">{{ trans('common.save') }}</button>
27+
</div>
2428
</form>
2529
</div>
2630

‎resources/views/users/edit.blade.php‎

Lines changed: 33 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -19,38 +19,42 @@
1919
</div>
2020
</div>
2121
<div class="row">
22-
<div class="col-md-6" ng-non-bindable>
23-
{!! csrf_field() !!}
24-
<input type="hidden" name="_method" value="put">
25-
@include('users.forms.' . $authMethod, ['model' => $user])
22+
<div class="col-sm-6" ng-non-bindable>
23+
{!! csrf_field() !!}
24+
<input type="hidden" name="_method" value="put">
25+
@include('users.forms.' . $authMethod, ['model' => $user])
2626

27-
</div>
28-
<div class="col-md-6">
29-
<div class="form-group" id="logo-control">
30-
<label for="user-avatar">{{ trans('settings.users_avatar') }}</label>
31-
<p class="small">{{ trans('settings.users_avatar_desc') }}</p>
32-
33-
@include('components.image-picker', [
34-
'resizeHeight' => '512',
35-
'resizeWidth' => '512',
36-
'showRemove' => false,
37-
'defaultImage' => baseUrl('/user_avatar.png'),
38-
'currentImage' => $user->getAvatar(80),
39-
'currentId' => $user->image_id,
40-
'name' => 'image_id',
41-
'imageClass' => 'avatar large'
42-
])
4327
</div>
44-
<div class="form-group">
45-
<label for="user-language">{{ trans('settings.users_preferred_language') }}</label>
46-
<select name="setting[language]" id="user-language">
47-
@foreach(trans('settings.language_select') as $lang => $label)
48-
<option @if(setting()->getUser($user, 'language') === $lang) selected @endif value="{{ $lang }}">{{ $label }}</option>
49-
@endforeach
50-
</select>
28+
<div class="col-sm-6">
29+
<div class="form-group" id="logo-control">
30+
<label for="user-avatar">{{ trans('settings.users_avatar') }}</label>
31+
<p class="small">{{ trans('settings.users_avatar_desc') }}</p>
32+
33+
@include('components.image-picker', [
34+
'resizeHeight' => '512',
35+
'resizeWidth' => '512',
36+
'showRemove' => false,
37+
'defaultImage' => baseUrl('/user_avatar.png'),
38+
'currentImage' => $user->getAvatar(80),
39+
'currentId' => $user->image_id,
40+
'name' => 'image_id',
41+
'imageClass' => 'avatar large'
42+
])
43+
</div>
44+
<div class="form-group">
45+
<label for="user-language">{{ trans('settings.users_preferred_language') }}</label>
46+
<select name="setting[language]" id="user-language">
47+
@foreach(trans('settings.language_select') as $lang => $label)
48+
<option @if(setting()->getUser($user, 'language') === $lang) selected @endif value="{{ $lang }}">{{ $label }}</option>
49+
@endforeach
50+
</select>
51+
</div>
5152
</div>
5253
</div>
53-
</div>
54+
<div class="form-group">
55+
<a href="{{ baseUrl($currentUser->can('users-manage') ? "/settings/users" : "/") }}" class="button muted">{{ trans('common.cancel') }}</a>
56+
<button class="button pos" type="submit">{{ trans('common.save') }}</button>
57+
</div>
5458
</form>
5559

5660
<hr class="margin-top large">
@@ -60,7 +64,7 @@
6064
<p class="text-muted">{{ trans('settings.users_social_accounts_info') }}</p>
6165
<div class="row">
6266
@foreach($activeSocialDrivers as $driver => $enabled)
63-
<div class="col-md-3 text-center">
67+
<div class="col-sm-3 col-xs-6 text-center">
6468
<div>@icon($driver, ['width' => 56])</div>
6569
<div>
6670
@if($user->hasSocialAccount($driver))

‎resources/views/users/forms/ldap.blade.php‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,4 @@
2222
<label for="external_auth_id">{{ trans('settings.users_external_auth_id') }}</label>
2323
@include('form.text', ['name' => 'external_auth_id'])
2424
</div>
25-
@endif
26-
27-
<div class="form-group">
28-
<a href="{{ baseUrl("/settings/users") }}" class="button muted">{{ trans('common.cancel') }}</a>
29-
<button class="button pos" type="submit">{{ trans('common.save') }}</button>
30-
</div>
25+
@endif

‎resources/views/users/forms/standard.blade.php‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,4 @@
3131
<div class="form-group">
3232
<label for="password-confirm">{{ trans('auth.password_confirm') }}</label>
3333
@include('form.password', ['name' => 'password-confirm'])
34-
</div>
35-
36-
<div class="form-group">
37-
<a href="{{ baseUrl("/settings/users") }}" class="button muted">{{ trans('common.cancel') }}</a>
38-
<button class="button pos" type="submit">{{ trans('common.save') }}</button>
39-
</div>
40-
34+
</div>

‎resources/views/users/forms/system.blade.php‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,3 @@
1919
</div>
2020
@endif
2121

22-
<div class="form-group">
23-
<a href="{{ baseUrl("/settings/users") }}" class="button muted">{{ trans('common.cancel') }}</a>
24-
<button class="button pos" type="submit">{{ trans('common.save') }}</button>
25-
</div>
26-

‎tests/LanguageTest.php‎

Lines changed: 30 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,24 @@
33
class LanguageTest extends TestCase
44
{
55

6-
public function test_js_endpoint_for_each_language() {
6+
protected $langs;
7+
8+
/**
9+
* LanguageTest constructor.
10+
*/
11+
public function setUp()
12+
{
13+
parent::setUp();
14+
$this->langs = array_diff(scandir(resource_path('lang')), ['..', '.']);
15+
}
16+
17+
public function test_js_endpoint_for_each_language()
18+
{
719

8-
$langs = array_diff(scandir(resource_path('lang')), ['..', '.']);
920
$visibleKeys = ['common', 'components', 'entities', 'errors'];
1021

1122
$this->asEditor();
12-
foreach ($langs as $lang) {
23+
foreach ($this->langs as $lang) {
1324
setting()->putUser($this->getEditor(), 'language', $lang);
1425
$transResp = $this->get('/translations');
1526
foreach ($visibleKeys as $key) {
@@ -18,4 +29,20 @@ public function test_js_endpoint_for_each_language() {
1829
}
1930
}
2031

32+
public function test_all_lang_files_loadable()
33+
{
34+
$files = array_diff(scandir(resource_path('lang/en')), ['..', '.']);
35+
foreach ($this->langs as $lang) {
36+
foreach ($files as $file) {
37+
$loadError = false;
38+
try {
39+
$translations = trans(str_replace('.php', '', $file), [], $lang);
40+
} catch (\Exception $e) {
41+
$loadError = true;
42+
}
43+
$this->assertFalse($loadError, "Translation file {$lang}/{$file} failed to load");
44+
}
45+
}
46+
}
47+
2148
}

0 commit comments

Comments
 (0)