Просмотр исходного кода

Merge pull request #118 from stof/translation_domain

Changed the translation domain to SonataAdminBundle
Thomas 14 лет назад
Родитель
Сommit
b9932845f4

+ 1 - 1
Admin/Admin.php

@@ -681,7 +681,7 @@ abstract class Admin implements AdminInterface
     public function getBatchActions()
     {
         return array(
-            'delete' => $this->trans('action_delete', array(), 'AdminBundle')
+            'delete' => $this->trans('action_delete', array(), 'SonataAdminBundle')
         );
     }
 

+ 1 - 1
Resources/translations/AdminBundle.de.xliff

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
-    <file source-language="en" datatype="plaintext" original="AdminBundle.en.xliff" >
+    <file source-language="en" datatype="plaintext" original="SonataAdminBundle.en.xliff" >
         <body>
             <trans-unit id="action_delete">
                 <source>action_delete</source>

Resources/translations/AdminBundle.en.xliff → Resources/translations/SonataAdminBundle.en.xliff


+ 1 - 1
Resources/translations/AdminBundle.es.xliff

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
-    <file source-language="en" datatype="plaintext" original="AdminBundle.en.xliff" >
+    <file source-language="en" datatype="plaintext" original="SonataAdminBundle.en.xliff" >
         <body>
             <trans-unit id="action_delete">
                 <source>action_delete</source>

+ 1 - 1
Resources/translations/AdminBundle.fr.xliff

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
-    <file source-language="en" datatype="plaintext" original="AdminBundle.en.xliff" >
+    <file source-language="en" datatype="plaintext" original="SonataAdminBundle.en.xliff" >
         <body>
             <trans-unit id="action_delete">
                 <source>action_delete</source>

+ 1 - 1
Resources/translations/AdminBundle.nl.xliff

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
-    <file source-language="en" datatype="plaintext" original="" >
+    <file source-language="en" datatype="plaintext" original="SonataAdminBundle.en.xliff" >
         <body>
             <trans-unit id="action_delete">
                 <source>action_delete</source>

+ 1 - 1
Resources/translations/AdminBundle.pl.xliff

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
-    <file source-language="en" datatype="plaintext" original="AdminBundle.en.xliff" >
+    <file source-language="en" datatype="plaintext" original="SonataAdminBundle.en.xliff" >
         <body>
             <trans-unit id="action_delete">
                 <source>action_delete</source>

+ 1 - 1
Resources/translations/AdminBundle.ru.xliff

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
-    <file source-language="ru" datatype="plaintext" original="" >
+    <file source-language="ru" datatype="plaintext" original="SonataAdminBundle.en.xliff" >
         <body>
             <trans-unit id="action_delete">
                 <source>action_delete</source>

+ 1 - 1
Resources/translations/AdminBundle.uk.xliff

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
-    <file source-language="uk" datatype="plaintext" original="" >
+    <file source-language="uk" datatype="plaintext" original="SonataAdminBundle.en.xliff" >
         <body>
             <trans-unit id="action_delete">
                 <source>action_delete</source>

+ 2 - 2
Resources/views/CRUD/action.html.twig

@@ -14,8 +14,8 @@ file that was distributed with this source code.
 {% block actions %}
     <div class="sonata-actions">
         <ul>
-            <li class="sonata-action-element"><a href="{{ admin.generateUrl('create') }}">{% trans from 'AdminBundle' %}link_action_create{% endtrans %}</a></li>
-            <li class="sonata-action-element"><a href="{{ admin.generateUrl('list') }}">{% trans from 'AdminBundle' %}link_action_list{% endtrans %}</a></li>
+            <li class="sonata-action-element"><a href="{{ admin.generateUrl('create') }}">{% trans from 'SonataAdminBundle' %}link_action_create{% endtrans %}</a></li>
+            <li class="sonata-action-element"><a href="{{ admin.generateUrl('list') }}">{% trans from 'SonataAdminBundle' %}link_action_list{% endtrans %}</a></li>
         </ul>
     </div>
 {% endblock %}

+ 9 - 9
Resources/views/CRUD/base_edit.html.twig

@@ -14,8 +14,8 @@ file that was distributed with this source code.
 {% block actions %}
     <div class="sonata-actions">
         <ul>
-            <li class="sonata-action-element"><a href="{{ admin.generateUrl('create') }}">{% trans from 'AdminBundle' %}link_action_create{% endtrans %}</a></li>
-            <li class="sonata-action-element"><a href="{{ admin.generateUrl('list') }}">{% trans from 'AdminBundle' %}link_action_list{% endtrans %}</a></li>
+            <li class="sonata-action-element"><a href="{{ admin.generateUrl('create') }}">{% trans from 'SonataAdminBundle' %}link_action_create{% endtrans %}</a></li>
+            <li class="sonata-action-element"><a href="{{ admin.generateUrl('list') }}">{% trans from 'SonataAdminBundle' %}link_action_list{% endtrans %}</a></li>
         </ul>
     </div>
 {% endblock %}
@@ -44,7 +44,7 @@ file that was distributed with this source code.
                     <legend>
                         {{ name|trans({}, admin.translationdomain) }}
                         {% if form_group.collapsed %}
-                            <a href="" class="sonata-ba-collapsed">{% trans from 'AdminBundle' %}link_expand{% endtrans %}</a>
+                            <a href="" class="sonata-ba-collapsed">{% trans from 'SonataAdminBundle' %}link_expand{% endtrans %}</a>
                         {% endif %}
                     </legend>
 
@@ -68,17 +68,17 @@ file that was distributed with this source code.
 
         {% if app.request.isxmlhttprequest %}
             {% if object.id %}
-                <input type="submit" name="btn_update" value="{% trans from 'AdminBundle' %}btn_update{% endtrans %}"/>
+                <input type="submit" name="btn_update" value="{% trans from 'SonataAdminBundle' %}btn_update{% endtrans %}"/>
             {% else %}
-                <input type="submit" name="btn_create" value="{% trans from 'AdminBundle' %}btn_create{% endtrans %}"/>
+                <input type="submit" name="btn_create" value="{% trans from 'SonataAdminBundle' %}btn_create{% endtrans %}"/>
             {% endif %}
         {% else %}
             {% if object.id %}
-                <input type="submit" name="btn_update_and_edit" value="{% trans from 'AdminBundle' %}btn_update_and_edit_again{% endtrans %}"/>
-                <input type="submit" name="btn_update_and_list" value="{% trans from 'AdminBundle' %}btn_update_and_return_to_list{% endtrans %}"/>
+                <input type="submit" name="btn_update_and_edit" value="{% trans from 'SonataAdminBundle' %}btn_update_and_edit_again{% endtrans %}"/>
+                <input type="submit" name="btn_update_and_list" value="{% trans from 'SonataAdminBundle' %}btn_update_and_return_to_list{% endtrans %}"/>
             {% else %}
-                <input type="submit" name="btn_create_and_edit" value="{% trans from 'AdminBundle' %}btn_create_and_edit_again{% endtrans %}"/>
-                <input type="submit" name="btn_create_and_create" value="{% trans from 'AdminBundle' %}btn_create_and_create_a_new_one{% endtrans %}"/>
+                <input type="submit" name="btn_create_and_edit" value="{% trans from 'SonataAdminBundle' %}btn_create_and_edit_again{% endtrans %}"/>
+                <input type="submit" name="btn_create_and_create" value="{% trans from 'SonataAdminBundle' %}btn_create_and_create_a_new_one{% endtrans %}"/>
             {% endif %}
         {% endif %}
     </form>

+ 8 - 8
Resources/views/CRUD/base_list.html.twig

@@ -14,7 +14,7 @@ file that was distributed with this source code.
 {% block actions %}
     <div class="sonata-actions">
         <ul>
-            <li class="sonata-action-element"><a href="{{ admin.generateUrl('create') }}">{% trans from 'AdminBundle' %}link_action_create{% endtrans %}</a></li>
+            <li class="sonata-action-element"><a href="{{ admin.generateUrl('create') }}">{% trans from 'SonataAdminBundle' %}link_action_create{% endtrans %}</a></li>
         </ul>
     </div>
 {% endblock %}
@@ -76,7 +76,7 @@ file that was distributed with this source code.
                             <td colspan="{{ admin.list.elements|length }}" class="pager">
                                 <ul>
                                     {% if admin.datagrid.pager.page != admin.datagrid.pager.previouspage %}
-                                        <li><a href="{{ admin.generateUrl('list', admin.datagrid.values|merge({'_page': admin.datagrid.pager.previouspage})) }}">{% trans from 'AdminBundle' %}link_previous_pager{% endtrans %}</a></li>
+                                        <li><a href="{{ admin.generateUrl('list', admin.datagrid.values|merge({'_page': admin.datagrid.pager.previouspage})) }}">{% trans from 'SonataAdminBundle' %}link_previous_pager{% endtrans %}</a></li>
                                     {% endif %}
 
                                     {# Set the number of pages to display in the pager #}
@@ -89,7 +89,7 @@ file that was distributed with this source code.
                                     {% endfor %}
 
                                     {% if admin.datagrid.pager.page != admin.datagrid.pager.nextpage %}
-                                        <li><a href="{{ admin.generateUrl('list', admin.datagrid.values|merge({'_page': admin.datagrid.pager.nextpage})) }}">{% trans from 'AdminBundle' %}link_next_pager{% endtrans %}</a></li>
+                                        <li><a href="{{ admin.generateUrl('list', admin.datagrid.values|merge({'_page': admin.datagrid.pager.nextpage})) }}">{% trans from 'SonataAdminBundle' %}link_next_pager{% endtrans %}</a></li>
                                     {% endif %}
                                 </ul>
                             </td>
@@ -104,7 +104,7 @@ file that was distributed with this source code.
                        $(this).closest('table').find("td input[type='checkbox']").attr('checked', $(this).is(':checked'));
                    });
                    $('.delete_link').click(function(e){
-                      if (!confirm('{% trans from 'AdminBundle' %}confirm_msg{% endtrans %}')) e.preventDefault();
+                      if (!confirm('{% trans from 'SonataAdminBundle' %}confirm_msg{% endtrans %}')) e.preventDefault();
                    });
                 });
             </script>
@@ -115,12 +115,12 @@ file that was distributed with this source code.
                         <option value="{{ action }}">{{ label }}</option>
                     {% endfor %}
                 </select>
-                <input type="submit" value="{% trans from 'AdminBundle' %}btn_batch{% endtrans %}" />
+                <input type="submit" value="{% trans from 'SonataAdminBundle' %}btn_batch{% endtrans %}" />
             </div>
         </form>
     {% else %}
         <p class="notice">
-          {% trans from 'AdminBundle' %}no_result{% endtrans %}
+          {% trans from 'SonataAdminBundle' %}no_result{% endtrans %}
         </p>
     {% endif %}
 {% endblock %}
@@ -134,9 +134,9 @@ file that was distributed with this source code.
                 </div>
             {% endfor %}
 
-            <input type="submit" value="{% trans from 'AdminBundle' %}btn_filter{% endtrans %}" />
+            <input type="submit" value="{% trans from 'SonataAdminBundle' %}btn_filter{% endtrans %}" />
 
-            <a href="{{ admin.generateUrl('list') }}">{% trans from 'AdminBundle' %}link_reset_filter{% endtrans %}</a>
+            <a href="{{ admin.generateUrl('list') }}">{% trans from 'SonataAdminBundle' %}link_reset_filter{% endtrans %}</a>
         </form>
     {% endif %}
 {% endblock %}

+ 1 - 1
Resources/views/CRUD/edit_orm_many_to_many.html.twig

@@ -24,7 +24,7 @@ file that was distributed with this source code.
                 class="sonata-ba-action">
                     <img
                         src="{{ asset('bundles/sonataadmin/famfamfam/add.png') }}"
-                        alt="{% trans from 'AdminBundle' %}btn_add{% endtrans %}"
+                        alt="{% trans from 'SonataAdminBundle' %}btn_add{% endtrans %}"
                     />
             </a>
         </span>

+ 2 - 2
Resources/views/CRUD/edit_orm_many_to_one.html.twig

@@ -47,7 +47,7 @@ file that was distributed with this source code.
                         onclick="start_field_dialog_form_list_{{ field_element.vars.id }}(event)"
                         class="sonata-ba-action">
                         <img src="{{ asset('bundles/sonataadmin/famfamfam/application_view_list.png') }}"
-                             alt="{% trans from 'AdminBundle' %}btn_add{% endtrans %}"
+                             alt="{% trans from 'SonataAdminBundle' %}btn_add{% endtrans %}"
                         />
                     </a>
                 {% endif %}
@@ -56,7 +56,7 @@ file that was distributed with this source code.
                     onclick="start_field_dialog_form_add_{{ field_element.vars.id }}(event)"
                     class="sonata-ba-action">
                         <img src="{{ asset('bundles/sonataadmin/famfamfam/add.png') }}"
-                            alt="{% trans from 'AdminBundle' %}btn_add{% endtrans %}"
+                            alt="{% trans from 'SonataAdminBundle' %}btn_add{% endtrans %}"
                         />
                 </a>
             </span>

+ 2 - 2
Resources/views/CRUD/edit_orm_one_to_many.html.twig

@@ -70,7 +70,7 @@ file that was distributed with this source code.
                     class="sonata-ba-action">
                     <img
                         src="{{ asset('bundles/sonataadmin/famfamfam/add.png') }}"
-                        alt="{% trans from 'AdminBundle' %}btn_add{% endtrans %}"
+                        alt="{% trans from 'SonataAdminBundle' %}btn_add{% endtrans %}"
                      />
                 </a>
             </span>
@@ -121,7 +121,7 @@ file that was distributed with this source code.
                     class="sonata-ba-action">
                     <img
                         src="{{ asset('bundles/sonataadmin/famfamfam/add.png') }}"
-                        alt="{% trans from 'AdminBundle' %}btn_add{% endtrans %}"
+                        alt="{% trans from 'SonataAdminBundle' %}btn_add{% endtrans %}"
                      />
                 </a>
             </span>

+ 2 - 2
Resources/views/CRUD/edit_orm_one_to_one.html.twig

@@ -47,7 +47,7 @@ file that was distributed with this source code.
                         class="sonata-ba-action">
                             <img
                                 src="{{ asset('bundles/sonataadmin/famfamfam/application_view_list.png') }}"
-                                alt="{% trans from 'AdminBundle' %}btn_add{% endtrans %}"
+                                alt="{% trans from 'SonataAdminBundle' %}btn_add{% endtrans %}"
                             />
                           </a>
                 {% endif %}
@@ -57,7 +57,7 @@ file that was distributed with this source code.
                     class="sonata-ba-action">
                         <img
                             src="{{ asset('bundles/sonataadmin/famfamfam/add.png') }}"
-                            alt="{% trans from 'AdminBundle' %}btn_add{% endtrans %}"
+                            alt="{% trans from 'SonataAdminBundle' %}btn_add{% endtrans %}"
                         />
                 </a>
             </span>

+ 2 - 2
Resources/views/CRUD/list__action_delete.html.twig

@@ -1,3 +1,3 @@
-<a href="{{ admin.generateUrl('delete', {'id': object.id}) }}" class="delete_link" title="{% trans from 'AdminBundle' %}action_delete{% endtrans %}">
-    <img src="{{ asset('bundles/sonataadmin/famfamfam/delete.png') }}" alt="{% trans from 'AdminBundle' %}action_delete{% endtrans %}" />
+<a href="{{ admin.generateUrl('delete', {'id': object.id}) }}" class="delete_link" title="{% trans from 'SonataAdminBundle' %}action_delete{% endtrans %}">
+    <img src="{{ asset('bundles/sonataadmin/famfamfam/delete.png') }}" alt="{% trans from 'SonataAdminBundle' %}action_delete{% endtrans %}" />
 </a>

+ 2 - 2
Resources/views/CRUD/list__action_edit.html.twig

@@ -1,3 +1,3 @@
-<a href="{{ admin.generateUrl('edit', {'id': object.id}) }}" class="edit_link" title="{% trans from 'AdminBundle' %}action_edit{% endtrans %}">
-    <img src="{{ asset('bundles/sonataadmin/famfamfam/page_white_edit.png') }}" alt="{% trans from 'AdminBundle' %}action_edit{% endtrans %}" />
+<a href="{{ admin.generateUrl('edit', {'id': object.id}) }}" class="edit_link" title="{% trans from 'SonataAdminBundle' %}action_edit{% endtrans %}">
+    <img src="{{ asset('bundles/sonataadmin/famfamfam/page_white_edit.png') }}" alt="{% trans from 'SonataAdminBundle' %}action_edit{% endtrans %}" />
 </a>

+ 2 - 2
Resources/views/CRUD/list__action_view.html.twig

@@ -1,3 +1,3 @@
-<a href="{{ admin.generateUrl('view', {'id': object.id}) }}" class="view_link" title="{% trans from 'AdminBundle' %}action_view{% endtrans %}">
-    <img src="{{ asset('bundles/sonataadmin/famfamfam/magnifier.png') }}" alt="{% trans from 'AdminBundle' %}action_view{% endtrans %}" />
+<a href="{{ admin.generateUrl('view', {'id': object.id}) }}" class="view_link" title="{% trans from 'SonataAdminBundle' %}action_view{% endtrans %}">
+    <img src="{{ asset('bundles/sonataadmin/famfamfam/magnifier.png') }}" alt="{% trans from 'SonataAdminBundle' %}action_view{% endtrans %}" />
 </a>

+ 5 - 5
Resources/views/Core/dashboard.html.twig

@@ -11,15 +11,15 @@ file that was distributed with this source code.
 
 {% extends base_template %}
 
-{% block title %}{% trans from 'AdminBundle' %}title_dashboard{% endtrans %}{% endblock%}
-{% block breadcrumb %}{% trans from 'AdminBundle' %}title_dashboard{% endtrans %}{% endblock %}
+{% block title %}{% trans from 'SonataAdminBundle' %}title_dashboard{% endtrans %}{% endblock%}
+{% block breadcrumb %}{% trans from 'SonataAdminBundle' %}title_dashboard{% endtrans %}{% endblock %}
 {% block content %}
 
     {% for code, group in groups %}
         <table class="sonata-ba-list">
             <thead>
                 <tr>
-                    <th  colspan="3">{{ code|trans({}, 'AdminBundle') }}</td>
+                    <th  colspan="3">{{ code|trans({}, 'SonataAdminBundle') }}</td>
                 </tr>
             </thead>
 
@@ -27,8 +27,8 @@ file that was distributed with this source code.
                 {% for admin in group %}
                     <tr>
                         <td class="sonata-ba-list-label">{{ admin.label|trans({}, admin.translationdomain) }}</td>
-                        <td><a href="{{ admin.generateUrl('create')}}"><img src="{{ asset('bundles/sonataadmin/famfamfam/add.png') }}" /> {% trans from 'AdminBundle' %}link_add{% endtrans %}</a></td>
-                        <td><a href="{{ admin.generateUrl('list')}}"><img src="{{ asset('bundles/sonataadmin/famfamfam/application_view_list.png') }}" />{% trans from 'AdminBundle' %}link_list{% endtrans %}</a></td>
+                        <td><a href="{{ admin.generateUrl('create')}}"><img src="{{ asset('bundles/sonataadmin/famfamfam/add.png') }}" /> {% trans from 'SonataAdminBundle' %}link_add{% endtrans %}</a></td>
+                        <td><a href="{{ admin.generateUrl('list')}}"><img src="{{ asset('bundles/sonataadmin/famfamfam/application_view_list.png') }}" />{% trans from 'SonataAdminBundle' %}link_list{% endtrans %}</a></td>
                     </tr>
                 {% endfor %}
             </tbody>

+ 2 - 2
Resources/views/standard_layout.html.twig

@@ -37,7 +37,7 @@ file that was distributed with this source code.
         {% endblock %}
 
         <title>
-            {% block title %} {% trans from 'AdminBundle' %}Admin{% endtrans %}
+            {% block title %} {% trans from 'SonataAdminBundle' %}Admin{% endtrans %}
                 {% if action is defined %}
                     -
                     {% for label, uri in admin.breadcrumbs(action) %}
@@ -64,7 +64,7 @@ file that was distributed with this source code.
         <div class="container">
             <div class="span-24 last header">
                 <div class="span-20">
-                    <a href="{{ url('sonata_admin_dashboard') }}" class="home">{% trans from 'AdminBundle' %}Admin{% endtrans %}</a>
+                    <a href="{{ url('sonata_admin_dashboard') }}" class="home">{% trans from 'SonataAdminBundle' %}Admin{% endtrans %}</a>
                 </div>
 
                 <div class="span-4 last">