Revert "Merge pull request #123 from phansys/translation_domain"

phansys · phansys · commit 15609f22fd21 · 2020-06-30T17:35:23.000-03:00
This reverts commit 36f0493, reversing changes made to 2ce57bb.
diff --git a/Command/AutoClosingCommand.php b/Command/AutoClosingCommand.php
@@ -99,7 +99,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         foreach ($resolved_tickets as $ticket) {
             $message = $this->ticketManager->createMessage()
                 ->setMessage(
-                    $this->translator->trans('MESSAGE_STATUS_CHANGED', ['%status%' => $this->translator->trans('STATUS_CLOSED', [], 'HackzillaTicketBundle')], 'HackzillaTicketBundle')
+                    $this->translator->trans('MESSAGE_STATUS_CHANGED', ['%status%' => $this->translator->trans('STATUS_CLOSED')])
                 )
                 ->setStatus(TicketMessage::STATUS_CLOSED)
                 ->setPriority($ticket->getPriority())
diff --git a/Controller/TicketAttachmentController.php b/Controller/TicketAttachmentController.php
@@ -25,7 +25,7 @@ public function downloadAction($ticketMessageId)
         $ticketMessage = $ticketManager->getMessageById($ticketMessageId);
 
         if (!$ticketMessage || !$ticketMessage instanceof TicketMessageWithAttachment) {
-            throw $this->createNotFoundException($this->get('translator')->trans('ERROR_FIND_TICKET_ENTITY', [], 'HackzillaTicketBundle'));
+            throw $this->createNotFoundException($this->get('translator')->trans('ERROR_FIND_TICKET_ENTITY'));
         }
 
         // check permissions
diff --git a/Controller/TicketController.php b/Controller/TicketController.php
@@ -30,7 +30,7 @@ public function indexAction(Request $request)
         $userManager   = $this->getUserManager();
         $ticketManager = $this->get('hackzilla_ticket.ticket_manager');
 
-        $ticketState    = $request->get('state', $this->get('translator')->trans('STATUS_OPEN', [], 'HackzillaTicketBundle'));
+        $ticketState    = $request->get('state', $this->get('translator')->trans('STATUS_OPEN'));
         $ticketPriority = $request->get('priority', null);
 
         $query = $ticketManager->getTicketListQuery(
@@ -157,7 +157,7 @@ public function replyAction(Request $request, $ticketId)
         $ticket        = $ticketManager->getTicketById($ticketId);
 
         if (!$ticket) {
-            throw $this->createNotFoundException($this->get('translator')->trans('ERROR_FIND_TICKET_ENTITY', [], 'HackzillaTicketBundle'));
+            throw $this->createNotFoundException($this->get('translator')->trans('ERROR_FIND_TICKET_ENTITY'));
         }
 
         $user = $this->getUserManager()->getCurrentUser();
@@ -212,7 +212,7 @@ public function deleteAction(Request $request, $ticketId)
                 $ticket        = $ticketManager->getTicketById($ticketId);
 
                 if (!$ticket) {
-                    throw $this->createNotFoundException($this->get('translator')->trans('ERROR_FIND_TICKET_ENTITY', [], 'HackzillaTicketBundle'));
+                    throw $this->createNotFoundException($this->get('translator')->trans('ERROR_FIND_TICKET_ENTITY'));
                 }
 
                 $ticketManager->deleteTicket($ticket);
diff --git a/Manager/TicketManager.php b/Manager/TicketManager.php
@@ -258,7 +258,7 @@ public function getTicketStatus($statusStr)
             $statuses = [];
 
             foreach (TicketMessageInterface::STATUSES as $id => $value) {
-                $statuses[$id] = $this->translator->trans($value, [], 'HackzillaTicketBundle');
+                $statuses[$id] = $this->translator->trans($value);
             }
         }
 
@@ -280,7 +280,7 @@ public function getTicketPriority($priorityStr)
             $priorities = [];
 
             foreach (TicketMessageInterface::PRIORITIES as $id => $value) {
-                $priorities[$id] = $this->translator->trans($value, [], 'HackzillaTicketBundle');
+                $priorities[$id] = $this->translator->trans($value);
             }
         }
 
diff --git a/Resources/views/Macros/macros.html.twig b/Resources/views/Macros/macros.html.twig
@@ -25,25 +25,25 @@
 {% macro status_alert(status, text) %}
     {% spaceless %}
         {% if status == 10 %}
-            <div class="alert alert-warning" role="alert"><span class="glyphicon glyphicon-folder-open"></span>&nbsp;&nbsp;{{ 'MESSAGE_STATUS_CHANGED'|trans({'%status%': text|upper }, 'HackzillaTicketBundle') }}
+            <div class="alert alert-warning" role="alert"><span class="glyphicon glyphicon-folder-open"></span>&nbsp;&nbsp;{{ 'MESSAGE_STATUS_CHANGED'|trans({'%status%': text|upper }) }}
             </div>
         {% elseif status == 11 %}
             <div class="alert alert-info" role="alert"><span
-                        class="glyphicon glyphicon-folder-open"></span>&nbsp;&nbsp;{{ 'MESSAGE_STATUS_CHANGED'|trans({'%status%': text|upper }, 'HackzillaTicketBundle') }}
+                        class="glyphicon glyphicon-folder-open"></span>&nbsp;&nbsp;{{ 'MESSAGE_STATUS_CHANGED'|trans({'%status%': text|upper }) }}
             </div>
         {% elseif status == 12 %}
             <div class="alert alert-info" role="alert"><span
-                        class="glyphicon glyphicon-folder-open"></span>&nbsp;&nbsp;{{ 'MESSAGE_STATUS_CHANGED'|trans({'%status%': text|upper }, 'HackzillaTicketBundle') }}
+                        class="glyphicon glyphicon-folder-open"></span>&nbsp;&nbsp;{{ 'MESSAGE_STATUS_CHANGED'|trans({'%status%': text|upper }) }}
             </div>
         {% elseif status == 13 %}
             <div class="alert alert-info" role="alert"><span
-                        class="glyphicon glyphicon-folder-open"></span>&nbsp;&nbsp;{{ 'MESSAGE_STATUS_CHANGED'|trans({'%status%': text|upper }, 'HackzillaTicketBundle') }}
+                        class="glyphicon glyphicon-folder-open"></span>&nbsp;&nbsp;{{ 'MESSAGE_STATUS_CHANGED'|trans({'%status%': text|upper }) }}
             </div>
         {% elseif status == 14 %}
-            <div class="alert alert-success" role="alert"><span class="glyphicon glyphicon-folder-open"></span>&nbsp;&nbsp;{{ 'MESSAGE_STATUS_CHANGED'|trans({'%status%': text|upper }, 'HackzillaTicketBundle') }}
+            <div class="alert alert-success" role="alert"><span class="glyphicon glyphicon-folder-open"></span>&nbsp;&nbsp;{{ 'MESSAGE_STATUS_CHANGED'|trans({'%status%': text|upper }) }}
             </div>
         {% elseif status == 15 %}
-            <div class="alert alert-danger" role="alert"><span class="glyphicon glyphicon-folder-close"></span>&nbsp;&nbsp;{{ 'MESSAGE_STATUS_CHANGED'|trans({'%status%': text|upper }, 'HackzillaTicketBundle') }}
+            <div class="alert alert-danger" role="alert"><span class="glyphicon glyphicon-folder-close"></span>&nbsp;&nbsp;{{ 'MESSAGE_STATUS_CHANGED'|trans({'%status%': text|upper }) }}
             </div>
         {% endif %}
     {% endspaceless %}
@@ -67,14 +67,14 @@
     {% spaceless %}
         {% if priority <= 20 %}
             <div class="alert alert-info"
-                 role="alert">{{ 'MESSAGE_PRIORITY_CHANGED'|trans({'%priority%': text|upper }, 'HackzillaTicketBundle') }}</div>
+                 role="alert">{{ 'MESSAGE_PRIORITY_CHANGED'|trans({'%priority%': text|upper }) }}</div>
         {% elseif priority == 21 %}
             <div class="alert alert-warning" role="alert"><span
-                        class="glyphicon glyphicon-asterisk"></span>&nbsp;&nbsp;{{ 'MESSAGE_PRIORITY_CHANGED'|trans({'%priority%': text|upper }, 'HackzillaTicketBundle') }}
+                        class="glyphicon glyphicon-asterisk"></span>&nbsp;&nbsp;{{ 'MESSAGE_PRIORITY_CHANGED'|trans({'%priority%': text|upper }) }}
             </div>
         {% else %}
             <div class="alert alert-danger" role="alert"><span
-                        class="glyphicon glyphicon-star"></span>&nbsp;&nbsp;{{ 'MESSAGE_PRIORITY_CHANGED'|trans({'%priority%': text|upper }, 'HackzillaTicketBundle') }}
+                        class="glyphicon glyphicon-star"></span>&nbsp;&nbsp;{{ 'MESSAGE_PRIORITY_CHANGED'|trans({'%priority%': text|upper }) }}
             </div>
         {% endif %}
     {% endspaceless %}
diff --git a/Resources/views/Ticket/index.html.twig b/Resources/views/Ticket/index.html.twig
@@ -2,15 +2,15 @@
 {% import 'hackzilla_ticket.templates.macros' as macros %}
 
 {% block hackzilla_ticket_content -%}
-    <h1>{{ 'HEADING_TICKET_LIST'|trans({}, 'HackzillaTicketBundle') }}</h1>
+    <h1>{{ 'HEADING_TICKET_LIST'|trans }}</h1>
 
     <div class="row">
         <div class="col-xs-4">
             <div class="btn-group">
-                <a href="{{ path('hackzilla_ticket', {'state': 'STATUS_OPEN'|trans({}, 'HackzillaTicketBundle')}) }}"
-                   class="btn btn-default {{ ticketState != 'STATUS_CLOSED'|trans({}, 'HackzillaTicketBundle') ? 'active' : '' }}">{{ 'STATUS_OPEN'|trans({}, 'HackzillaTicketBundle')|upper }}</a>
-                <a href="{{ path('hackzilla_ticket', {'state': 'STATUS_CLOSED'|trans({}, 'HackzillaTicketBundle')}) }}"
-                   class="btn btn-default {{ ticketState == 'STATUS_CLOSED'|trans({}, 'HackzillaTicketBundle') ? 'active' : '' }}">{{ 'STATUS_CLOSED'|trans({}, 'HackzillaTicketBundle')|upper }}</a>
+                <a href="{{ path('hackzilla_ticket', {'state': 'STATUS_OPEN'|trans}) }}"
+                   class="btn btn-default {{ ticketState != 'STATUS_CLOSED'|trans ? 'active' : '' }}">{{ 'STATUS_OPEN'|trans|upper }}</a>
+                <a href="{{ path('hackzilla_ticket', {'state': 'STATUS_CLOSED'|trans}) }}"
+                   class="btn btn-default {{ ticketState == 'STATUS_CLOSED'|trans ? 'active' : '' }}">{{ 'STATUS_CLOSED'|trans|upper }}</a>
             </div>
         </div>
 
@@ -19,33 +19,33 @@
                 <a href="{{ path('hackzilla_ticket') }}"
                    class="btn btn-default {{ ticketPriority is null ? 'active' : '' }}"><span
                             class="glyphicon glyphicon-remove"></span></a>
-                <a href="{{ path('hackzilla_ticket', {'priority': 'PRIORITY_HIGH'|trans({}, 'HackzillaTicketBundle')}) }}"
-                   class="btn btn-danger {{ ticketPriority == 'PRIORITY_HIGH'|trans({}, 'HackzillaTicketBundle') ? 'active' : '' }}">{{ 'PRIORITY_HIGH'|trans({}, 'HackzillaTicketBundle')|upper }}</a>
-                <a href="{{ path('hackzilla_ticket', {'priority': 'PRIORITY_MEDIUM'|trans({}, 'HackzillaTicketBundle')}) }}"
-                   class="btn btn-warning {{ ticketPriority == 'PRIORITY_MEDIUM'|trans({}, 'HackzillaTicketBundle') ? 'active' : '' }}">{{ 'PRIORITY_MEDIUM'|trans({}, 'HackzillaTicketBundle')|upper }}</a>
-                <a href="{{ path('hackzilla_ticket', {'priority': 'PRIORITY_LOW'|trans({}, 'HackzillaTicketBundle')}) }}"
-                   class="btn btn-info {{ ticketPriority == 'PRIORITY_LOW'|trans({}, 'HackzillaTicketBundle') ? 'active' : '' }}">{{ 'PRIORITY_LOW'|trans({}, 'HackzillaTicketBundle')|upper }}</a>
+                <a href="{{ path('hackzilla_ticket', {'priority': 'PRIORITY_HIGH'|trans}) }}"
+                   class="btn btn-danger {{ ticketPriority == 'PRIORITY_HIGH'|trans ? 'active' : '' }}">{{ 'PRIORITY_HIGH'|trans|upper }}</a>
+                <a href="{{ path('hackzilla_ticket', {'priority': 'PRIORITY_MEDIUM'|trans}) }}"
+                   class="btn btn-warning {{ ticketPriority == 'PRIORITY_MEDIUM'|trans ? 'active' : '' }}">{{ 'PRIORITY_MEDIUM'|trans|upper }}</a>
+                <a href="{{ path('hackzilla_ticket', {'priority': 'PRIORITY_LOW'|trans}) }}"
+                   class="btn btn-info {{ ticketPriority == 'PRIORITY_LOW'|trans ? 'active' : '' }}">{{ 'PRIORITY_LOW'|trans|upper }}</a>
             </div>
         </div>
 
         <div class="col-xs-4 text-right">
             <div class="btn-group">
                 <a href="{{ path('hackzilla_ticket_new') }}" class="btn btn-primary"><span
-                            class="glyphicon glyphicon-plus"></span> {{ 'BUTTON_NEW'|trans({}, 'HackzillaTicketBundle') }}</a>
+                            class="glyphicon glyphicon-plus"></span> {{ 'BUTTON_NEW'|trans }}</a>
             </div>
         </div>
     </div>
 
     <table class="table table-bordered table-striped">
         <thead>
         <tr>
-            <th class="col-xs-1">{{ knp_pagination_sortable(pagination, 'HEADING_TICKET'|trans({}, 'HackzillaTicketBundle'), 't.id') }}</th>
-            <th{% if pagination.isSorted('t.subject') %} class="sorted"{% endif %}>{{ knp_pagination_sortable(pagination, 'HEADING_SUBJECT'|trans({}, 'HackzillaTicketBundle'), 't.subject') }}</th>
-            <th{% if pagination.isSorted('t.userCreated') %} class="sorted"{% endif %}>{{ knp_pagination_sortable(pagination, 'HEADING_AUTHOR'|trans({}, 'HackzillaTicketBundle'), 't.userCreated') }}</th>
-            <th{% if pagination.isSorted('t.status') %} class="sorted"{% endif %}>{{ knp_pagination_sortable(pagination, 'HEADING_STATUS'|trans({}, 'HackzillaTicketBundle'), 't.status') }}</th>
-            <th{% if pagination.isSorted('t.priority') %} class="sorted"{% endif %}>{{ knp_pagination_sortable(pagination, 'HEADING_PRIORITY'|trans({}, 'HackzillaTicketBundle'), 't.priority') }}</th>
-            <th{% if pagination.isSorted('t.modified') %} class="sorted"{% endif %}>{{ knp_pagination_sortable(pagination, 'HEADING_MODIFIED'|trans({}, 'HackzillaTicketBundle'), 't.lastMessage') }}</th>
-            <th{% if pagination.isSorted('t.created') %} class="sorted"{% endif %}>{{ knp_pagination_sortable(pagination, 'HEADING_CREATED'|trans({}, 'HackzillaTicketBundle'), 't.createdAt') }}</th>
+            <th class="col-xs-1">{{ knp_pagination_sortable(pagination, 'HEADING_TICKET'|trans, 't.id') }}</th>
+            <th{% if pagination.isSorted('t.subject') %} class="sorted"{% endif %}>{{ knp_pagination_sortable(pagination, 'HEADING_SUBJECT'|trans, 't.subject') }}</th>
+            <th{% if pagination.isSorted('t.userCreated') %} class="sorted"{% endif %}>{{ knp_pagination_sortable(pagination, 'HEADING_AUTHOR'|trans, 't.userCreated') }}</th>
+            <th{% if pagination.isSorted('t.status') %} class="sorted"{% endif %}>{{ knp_pagination_sortable(pagination, 'HEADING_STATUS'|trans, 't.status') }}</th>
+            <th{% if pagination.isSorted('t.priority') %} class="sorted"{% endif %}>{{ knp_pagination_sortable(pagination, 'HEADING_PRIORITY'|trans, 't.priority') }}</th>
+            <th{% if pagination.isSorted('t.modified') %} class="sorted"{% endif %}>{{ knp_pagination_sortable(pagination, 'HEADING_MODIFIED'|trans, 't.lastMessage') }}</th>
+            <th{% if pagination.isSorted('t.created') %} class="sorted"{% endif %}>{{ knp_pagination_sortable(pagination, 'HEADING_CREATED'|trans, 't.createdAt') }}</th>
         </tr>
         </thead>
         <tbody>
@@ -54,14 +54,14 @@
                 <td><a href="{{ path('hackzilla_ticket_show', { 'ticketId': entity.id }) }}">{{ entity.id }}</a></td>
                 <td><a href="{{ path('hackzilla_ticket_show', { 'ticketId': entity.id }) }}">{{ entity.subject }}</a></td>
                 <td>{{ entity.userCreatedObject }}</td>
-                <td>{{ macros.status_btn(entity.status, entity.statusString|trans({}, 'HackzillaTicketBundle'), true) }}</td>
-                <td>{{ macros.priority_btn(entity.priority, entity.priorityString|trans({}, 'HackzillaTicketBundle'), true) }}</td>
-                <td>{% if entity.lastMessage %}{{ entity.lastMessage|date('LABEL_DATE_TIME_FORMAT'|trans({}, 'HackzillaTicketBundle')) }}{% endif %}</td>
-                <td>{% if entity.createdAt %}{{ entity.createdAt|date('LABEL_DATE_TIME_FORMAT'|trans({}, 'HackzillaTicketBundle')) }}{% endif %}</td>
+                <td>{{ macros.status_btn(entity.status, entity.statusString|trans, true) }}</td>
+                <td>{{ macros.priority_btn(entity.priority, entity.priorityString|trans, true) }}</td>
+                <td>{% if entity.lastMessage %}{{ entity.lastMessage|date('LABEL_DATE_TIME_FORMAT'|trans) }}{% endif %}</td>
+                <td>{% if entity.createdAt %}{{ entity.createdAt|date('LABEL_DATE_TIME_FORMAT'|trans) }}{% endif %}</td>
             </tr>
         {% else %}
             <tr>
-                <td colspan="7">{{ 'MESSAGE_NO_TICKETS'|trans({}, 'HackzillaTicketBundle') }}.</td>
+                <td colspan="7">{{ 'MESSAGE_NO_TICKETS'|trans }}.</td>
             </tr>
         {% endfor %}
         </tbody>
diff --git a/Resources/views/Ticket/new.html.twig b/Resources/views/Ticket/new.html.twig
@@ -1,7 +1,7 @@
 {% extends '@HackzillaTicket/layout.html.twig' %}
 
 {% block hackzilla_ticket_content -%}
-    <h1>{{ 'HEADING_NEW_TICKET'|trans({}, 'HackzillaTicketBundle') }}</h1>
+    <h1>{{ 'HEADING_NEW_TICKET'|trans }}</h1>
 
     <div class="well well-sm">
         {{ form_start(form, {'method': 'POST', 'action': path('hackzilla_ticket_create')}) }}
@@ -23,10 +23,10 @@
 
             <div class="form-group row">
                 <div class="col-lg-offset-2 col-lg-10 col-md-offset-2 col-md-10 col-sm-offset-2 col-sm-10">
-                    <button type="submit" class="btn btn-primary">{{ 'BUTTON_CREATE'|trans({}, 'HackzillaTicketBundle') }}</button>
+                    <button type="submit" class="btn btn-primary">{{ 'BUTTON_CREATE'|trans }}</button>
 
                     <a href="{{ path('hackzilla_ticket') }}" class="btn btn-default">
-                        {{ 'BUTTON_BACK_TO_LIST'|trans({}, 'HackzillaTicketBundle') }}
+                        {{ 'BUTTON_BACK_TO_LIST'|trans }}
                     </a>
                 </div>
             </div>
diff --git a/Resources/views/Ticket/show.html.twig b/Resources/views/Ticket/show.html.twig

Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ protected function execute(InputInterface $input, OutputInterface $output)`
`99`	`99`	`foreach ($resolved_tickets as $ticket) {`
`100`	`100`	`$message = $this->ticketManager->createMessage()`
`101`	`101`	`->setMessage(`
`102`		`- $this->translator->trans('MESSAGE_STATUS_CHANGED', ['%status%' => $this->translator->trans('STATUS_CLOSED', [], 'HackzillaTicketBundle')], 'HackzillaTicketBundle')`
	`102`	`+ $this->translator->trans('MESSAGE_STATUS_CHANGED', ['%status%' => $this->translator->trans('STATUS_CLOSED')])`
`103`	`103`	`)`
`104`	`104`	`->setStatus(TicketMessage::STATUS_CLOSED)`
`105`	`105`	`->setPriority($ticket->getPriority())`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public function downloadAction($ticketMessageId)`
`25`	`25`	`$ticketMessage = $ticketManager->getMessageById($ticketMessageId);`
`26`	`26`
`27`	`27`	`if (!$ticketMessage \|\| !$ticketMessage instanceof TicketMessageWithAttachment) {`
`28`		`- throw $this->createNotFoundException($this->get('translator')->trans('ERROR_FIND_TICKET_ENTITY', [], 'HackzillaTicketBundle'));`
	`28`	`+ throw $this->createNotFoundException($this->get('translator')->trans('ERROR_FIND_TICKET_ENTITY'));`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`// check permissions`
Original file line number	Diff line number	Diff line change
`@@ -258,7 +258,7 @@ public function getTicketStatus($statusStr)`
`258`	`258`	`$statuses = [];`
`259`	`259`
`260`	`260`	`foreach (TicketMessageInterface::STATUSES as $id => $value) {`
`261`		`- $statuses[$id] = $this->translator->trans($value, [], 'HackzillaTicketBundle');`
	`261`	`+ $statuses[$id] = $this->translator->trans($value);`
`262`	`262`	`}`
`263`	`263`	`}`
`264`	`264`
`@@ -280,7 +280,7 @@ public function getTicketPriority($priorityStr)`
`280`	`280`	`$priorities = [];`
`281`	`281`
`282`	`282`	`foreach (TicketMessageInterface::PRIORITIES as $id => $value) {`
`283`		`- $priorities[$id] = $this->translator->trans($value, [], 'HackzillaTicketBundle');`
	`283`	`+ $priorities[$id] = $this->translator->trans($value);`
`284`	`284`	`}`
`285`	`285`	`}`
`286`	`286`