From 5749ef2691d10261a62494aaedb6486eb05a1ca6 Mon Sep 17 00:00:00 2001 From: Luca Volpones Date: Wed, 8 Nov 2017 19:12:42 +0100 Subject: [PATCH 1/3] Suggested improvements to labels and translations --- resources/lang/en/lang.php | 1 + resources/lang/it/lang.php | 1 + .../default1/admin/helpdesk/agent/agents/index.blade.php | 6 +++--- .../default1/admin/helpdesk/agent/groups/index.blade.php | 6 +++--- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/resources/lang/en/lang.php b/resources/lang/en/lang.php index e576f8265..aff6f594d 100644 --- a/resources/lang/en/lang.php +++ b/resources/lang/en/lang.php @@ -886,6 +886,7 @@ return [ 'group_deleted_successfully' => 'Group deleted successfully', 'group_cannot_delete' => 'Group cannot delete', 'failed_to_load_the_page' => 'Failed to load the page', + 'list_of_groups' => 'List of groups', /* |-------------------------------------- | SMTP Page diff --git a/resources/lang/it/lang.php b/resources/lang/it/lang.php index 087f45769..b9deff7c8 100644 --- a/resources/lang/it/lang.php +++ b/resources/lang/it/lang.php @@ -572,6 +572,7 @@ return [ 'admin_notes' => 'Note Admin', 'group_members' => 'Componenti del Gruppo', 'group_name' => 'Nome Gruppo', + 'list_of_groups' => 'Elenco gruppi', /* |-------------------------------------- | SMTP Page diff --git a/resources/views/themes/default1/admin/helpdesk/agent/agents/index.blade.php b/resources/views/themes/default1/admin/helpdesk/agent/agents/index.blade.php index 50a10b3bd..b2deec39a 100644 --- a/resources/views/themes/default1/admin/helpdesk/agent/agents/index.blade.php +++ b/resources/views/themes/default1/admin/helpdesk/agent/agents/index.blade.php @@ -16,7 +16,7 @@ class="active" @stop @section('PageHeader') -

{{ Lang::get('lang.staffs')}}

+

{{ Lang::get('lang.agents')}}

@stop @@ -40,7 +40,7 @@ class="active"
- {{Session::get('success')}} + {{Session::get('success')}}
@endif @@ -116,4 +116,4 @@ class="active" -@stop \ No newline at end of file +@stop diff --git a/resources/views/themes/default1/admin/helpdesk/agent/groups/index.blade.php b/resources/views/themes/default1/admin/helpdesk/agent/groups/index.blade.php index 6734ede3b..94802437a 100644 --- a/resources/views/themes/default1/admin/helpdesk/agent/groups/index.blade.php +++ b/resources/views/themes/default1/admin/helpdesk/agent/groups/index.blade.php @@ -16,7 +16,7 @@ class="active" @stop @section('PageHeader') -

{{Lang::get('lang.staffs')}}

+

{{Lang::get('lang.groups')}}

@stop @@ -31,7 +31,7 @@ class="active"
-

{!! Lang::get('lang.groups') !!}

 {{Lang::get('lang.create_group')}}
+

{!! Lang::get('lang.list_of_groups') !!}

 {{Lang::get('lang.create_group')}}
@if(Session::has('success')) @@ -84,4 +84,4 @@ class="active"
-@stop \ No newline at end of file +@stop From 3bf81b18daaa6ecd70a0bca022e09777493e3970 Mon Sep 17 00:00:00 2001 From: Luca Volpones Date: Wed, 8 Nov 2017 19:23:00 +0100 Subject: [PATCH 2/3] Single use of duplicated translation --- app/Http/breadcrumbs.php | 2 +- resources/lang/de/lang.php | 1 - resources/lang/en/lang.php | 1 - resources/lang/fr/lang.php | 1 - resources/lang/it/lang.php | 1 - resources/lang/nl/lang.php | 1 - resources/lang/pt/lang.php | 1 - resources/lang/ru/lang.php | 1 - 8 files changed, 1 insertion(+), 8 deletions(-) diff --git a/app/Http/breadcrumbs.php b/app/Http/breadcrumbs.php index cef4a36c6..12ccac9fd 100644 --- a/app/Http/breadcrumbs.php +++ b/app/Http/breadcrumbs.php @@ -82,7 +82,7 @@ Breadcrumbs::register('emails.edit', function ($breadcrumbs) { Breadcrumbs::register('banlist.index', function ($breadcrumbs) { $breadcrumbs->parent('setting'); - $breadcrumbs->push(Lang::get('lang.banlists'), route('banlist.index')); + $breadcrumbs->push(Lang::get('lang.ban_lists'), route('banlist.index')); }); Breadcrumbs::register('banlist.create', function ($breadcrumbs) { $breadcrumbs->parent('banlist.index'); diff --git a/resources/lang/de/lang.php b/resources/lang/de/lang.php index dba6d0849..abb0820e0 100644 --- a/resources/lang/de/lang.php +++ b/resources/lang/de/lang.php @@ -124,7 +124,6 @@ return [ */ 'ban_lists' => 'Ban Lists', 'ban_email' => 'Ban Email', - 'banlists' => 'Ban lists', 'ban_status' => 'Ban Status', /* |-------------------------------------- diff --git a/resources/lang/en/lang.php b/resources/lang/en/lang.php index aff6f594d..676ce07e3 100644 --- a/resources/lang/en/lang.php +++ b/resources/lang/en/lang.php @@ -171,7 +171,6 @@ return [ */ 'ban_lists' => 'Ban lists', 'ban_email' => 'Ban email', - 'banlists' => 'Ban lists', 'ban_status' => 'Ban status', 'list_of_banned_emails' => 'List of banned emails', 'edit_banned_email' => 'Edit banned email', diff --git a/resources/lang/fr/lang.php b/resources/lang/fr/lang.php index e8656a327..eaa772616 100644 --- a/resources/lang/fr/lang.php +++ b/resources/lang/fr/lang.php @@ -149,7 +149,6 @@ return [ */ 'ban_lists' => 'Ban lists', 'ban_email' => 'Ban email', - 'banlists' => 'Ban lists', 'ban_status' => 'Ban status', 'list_of_banned_emails' => 'List of banned emails', 'edit_banned_email' => 'Edit banned email', diff --git a/resources/lang/it/lang.php b/resources/lang/it/lang.php index b9deff7c8..3a4d3f308 100644 --- a/resources/lang/it/lang.php +++ b/resources/lang/it/lang.php @@ -125,7 +125,6 @@ return [ */ 'ban_lists' => 'Lista Ban', 'ban_email' => 'Email Ban', - 'banlists' => 'Liste Ban', 'ban_status' => 'Status Ban', /* |-------------------------------------- diff --git a/resources/lang/nl/lang.php b/resources/lang/nl/lang.php index fbf5463fb..86e6c0e74 100644 --- a/resources/lang/nl/lang.php +++ b/resources/lang/nl/lang.php @@ -182,7 +182,6 @@ return [ */ 'ban_lists' => 'Blokkeringslijst', 'ban_email' => 'Blokkeer E-mailadres', - 'banlists' => 'Blokkeringslijst', 'ban_status' => 'Blokkeringsstatus', 'list_of_banned_emails' => 'Lijst van geblokkeerde e-mailadressen', 'edit_banned_email' => 'Bewerk geblokkeerde e-mailadressen', diff --git a/resources/lang/pt/lang.php b/resources/lang/pt/lang.php index 35727ce30..488fdf134 100644 --- a/resources/lang/pt/lang.php +++ b/resources/lang/pt/lang.php @@ -160,7 +160,6 @@ return [ */ 'ban_lists' => 'Lista de bloqueio', 'ban_email' => 'E-mails bloqueados', - 'banlists' => 'Lista de bloqueio', 'ban_status' => 'Status de bloqueio', 'list_of_banned_emails' => 'Lista de E-mails bloqueados', 'edit_banned_email' => 'Editar um bloqueio de E-mails', diff --git a/resources/lang/ru/lang.php b/resources/lang/ru/lang.php index 0fc6c253d..8c101d18c 100644 --- a/resources/lang/ru/lang.php +++ b/resources/lang/ru/lang.php @@ -111,7 +111,6 @@ return [ */ 'ban_lists' => 'Лист запретов', 'ban_email' => 'Запрет Email', - 'banlists' => 'Листы запретов', 'ban_status' => 'Статус запретов', /* |-------------------------------------- From d0fa55e42628a508bf550197d770b2c0c958bbc3 Mon Sep 17 00:00:00 2001 From: Luca Volpones Date: Wed, 8 Nov 2017 19:44:30 +0100 Subject: [PATCH 3/3] Version label --- resources/lang/de/lang.php | 1 + resources/lang/en/lang.php | 1 + resources/lang/fr/lang.php | 1 + resources/lang/it/lang.php | 1 + resources/lang/nl/lang.php | 1 + resources/lang/pt/lang.php | 1 + resources/lang/ru/lang.php | 1 + .../admin/helpdesk/tickets/ticket.blade.php | 4 +- .../admin/helpdesk/tickets/timeline.blade.php | 46 +++++++++---------- .../admin/kb/article/layout.blade.php | 4 +- .../default1/admin/layout/admin.blade.php | 28 +++++------ .../default1/agent/layout/agent.blade.php | 30 ++++++------ .../default1/agent/layout/agentold.blade.php | 38 +++++++-------- .../themes/default1/agent/layout/kb.blade.php | 4 +- .../themes/default1/layouts/admin.blade.php | 14 +++--- .../themes/default1/layouts/agent.blade.php | 4 +- .../themes/default1/layouts/blank.blade.php | 4 +- .../themes/default1/layouts/guest.blade.php | 4 +- .../themes/default1/layouts/kb.blade.php | 4 +- 19 files changed, 99 insertions(+), 92 deletions(-) diff --git a/resources/lang/de/lang.php b/resources/lang/de/lang.php index abb0820e0..159fce87e 100644 --- a/resources/lang/de/lang.php +++ b/resources/lang/de/lang.php @@ -813,6 +813,7 @@ return [ 'copyright' => 'Copyright', 'all_rights_reserved' => 'All right Reserved', 'powered_by' => 'Powered by', + 'version' => 'Version', /* |------------------------------------------------ |Guest-User Page diff --git a/resources/lang/en/lang.php b/resources/lang/en/lang.php index 676ce07e3..27e51af39 100644 --- a/resources/lang/en/lang.php +++ b/resources/lang/en/lang.php @@ -1164,6 +1164,7 @@ return [ 'copyright' => 'Copyright', 'all_rights_reserved' => 'All rights reserved', 'powered_by' => 'Powered by', + 'version' => 'Version', /* |------------------------------------------------ |Guest-User Page diff --git a/resources/lang/fr/lang.php b/resources/lang/fr/lang.php index eaa772616..07036ae58 100644 --- a/resources/lang/fr/lang.php +++ b/resources/lang/fr/lang.php @@ -1125,6 +1125,7 @@ return [ 'copyright' => 'Copyright', 'all_rights_reserved' => 'Tous droits réservés', 'powered_by' => 'Powered by', + 'version' => 'Version', /* |------------------------------------------------ |Guest-User Page diff --git a/resources/lang/it/lang.php b/resources/lang/it/lang.php index 3a4d3f308..69f50a2d5 100644 --- a/resources/lang/it/lang.php +++ b/resources/lang/it/lang.php @@ -126,6 +126,7 @@ return [ 'ban_lists' => 'Lista Ban', 'ban_email' => 'Email Ban', 'ban_status' => 'Status Ban', + 'version' => 'Versione', /* |-------------------------------------- | Templates Index Page diff --git a/resources/lang/nl/lang.php b/resources/lang/nl/lang.php index 86e6c0e74..599fe4960 100644 --- a/resources/lang/nl/lang.php +++ b/resources/lang/nl/lang.php @@ -1186,6 +1186,7 @@ return [ 'copyright' => 'Copyright', 'all_rights_reserved' => 'Alle rechten voorbehouden', 'powered_by' => 'Mogelijk gemaakt door', + 'version' => 'Version', /* |------------------------------------------------ |Guest-User Page diff --git a/resources/lang/pt/lang.php b/resources/lang/pt/lang.php index 488fdf134..c9846454b 100644 --- a/resources/lang/pt/lang.php +++ b/resources/lang/pt/lang.php @@ -1120,6 +1120,7 @@ return [ 'copyright' => 'Copyright', 'all_rights_reserved' => 'Todos os direitos reservados', 'powered_by' => 'Distribuído por', + 'version' => 'Version', /* |------------------------------------------------ |Guest-User Page diff --git a/resources/lang/ru/lang.php b/resources/lang/ru/lang.php index 8c101d18c..2b2dec983 100644 --- a/resources/lang/ru/lang.php +++ b/resources/lang/ru/lang.php @@ -720,6 +720,7 @@ return [ 'copyright' => 'Copyright', 'all_rights_reserved' => 'Все права защищены', 'powered_by' => 'Разработано на', + 'version' => 'Version', /* |------------------------------------------------ |Гостевая-Страница Пользователя diff --git a/resources/views/themes/default1/admin/helpdesk/tickets/ticket.blade.php b/resources/views/themes/default1/admin/helpdesk/tickets/ticket.blade.php index 455c3b7da..e1dcf3a6b 100644 --- a/resources/views/themes/default1/admin/helpdesk/tickets/ticket.blade.php +++ b/resources/views/themes/default1/admin/helpdesk/tickets/ticket.blade.php @@ -366,7 +366,7 @@
Copyright © 2014-2015 Ladybird Web Solution. All rights reserved.
@@ -434,4 +434,4 @@ - \ No newline at end of file + diff --git a/resources/views/themes/default1/admin/helpdesk/tickets/timeline.blade.php b/resources/views/themes/default1/admin/helpdesk/tickets/timeline.blade.php index dcb104184..e9e59c663 100644 --- a/resources/views/themes/default1/admin/helpdesk/tickets/timeline.blade.php +++ b/resources/views/themes/default1/admin/helpdesk/tickets/timeline.blade.php @@ -12,7 +12,7 @@ - @@ -22,7 +22,7 @@ - +
-
    @@ -261,7 +261,7 @@
-
    @@ -276,25 +276,25 @@
    -
    +
    -
    +
    SLA Plan: Default SLA Plan
    -
    +
    Create Date: 12/03/2015 1:40 Pm
    -
    +
    Due Date: 15/03/2015 1:05 pm
    -
    +
    Last Response: 15/03/2015 1:05 pm
    -
    -
    +
    +
    @@ -304,7 +304,7 @@
    Status: Open
    -
    +
    @@ -315,7 +315,7 @@
    -
    +
    @@ -358,7 +358,7 @@
    -
+
@@ -372,7 +372,7 @@
-
+
@@ -380,13 +380,13 @@
- +
- + @@ -416,7 +416,7 @@
- +
@@ -456,7 +456,7 @@
- +
@@ -583,7 +583,7 @@
Copyright © 2014-2015 Ladybird Web Solution. All rights reserved.
diff --git a/resources/views/themes/default1/admin/kb/article/layout.blade.php b/resources/views/themes/default1/admin/kb/article/layout.blade.php index e042d1e74..de5745509 100644 --- a/resources/views/themes/default1/admin/kb/article/layout.blade.php +++ b/resources/views/themes/default1/admin/kb/article/layout.blade.php @@ -197,7 +197,7 @@
Copyright © {{date("Y")}} {{$settings->company_name}}. Powered By Faveo.
@@ -232,4 +232,4 @@ - \ No newline at end of file + diff --git a/resources/views/themes/default1/admin/layout/admin.blade.php b/resources/views/themes/default1/admin/layout/admin.blade.php index bf6c51e1e..0e6c0b351 100644 --- a/resources/views/themes/default1/admin/layout/admin.blade.php +++ b/resources/views/themes/default1/admin/layout/admin.blade.php @@ -5,7 +5,7 @@ Faveo | HELP DESK - + @@ -33,9 +33,9 @@ - + - + @@ -246,7 +246,7 @@
  • {!! Lang::get('lang.email-settings') !!}
  • {!! Lang::get('lang.queues') !!}
  • {!! Lang::get('lang.diagnostics') !!}
    • - + @@ -367,7 +367,7 @@