add order of translation formats

The preferred order of the different translation formats in configuration blocks is Xliff, YAML, PHP. Thus, this has to be documented in the contributing section. Since the order being used before was Xliff, PHP, YAML, existing examples had to be modified accordingly.
symfony · Aug 15, 2014 · ef4dd23 · ef4dd23
1 parent 2b1935b
commit ef4dd23
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 15 deletions.
diff --git a/book/translation.rst b/book/translation.rst
@@ -136,18 +136,18 @@ different formats, XLIFF being the recommended format:
             </file>
         </xliff>
 
+    .. code-block:: yaml
+
+        # messages.fr.yml
+        Symfony2 is great: J'aime Symfony2
+
     .. code-block:: php
 
         // messages.fr.php
         return array(
             'Symfony2 is great' => 'J\'aime Symfony2',
         );
 
-    .. code-block:: yaml
-
-        # messages.fr.yml
-        Symfony2 is great: J'aime Symfony2
-
 For information on where these files should be located, see
 :ref:`book-translation-resource-locations`.
 
@@ -638,18 +638,18 @@ bundle.
             </file>
         </xliff>
 
+    .. code-block:: yaml
+
+        # validators.en.yml
+        author.name.not_blank: Please enter an author name.
+
     .. code-block:: php
 
         // validators.en.php
         return array(
             'author.name.not_blank' => 'Please enter an author name.',
         );
 
-    .. code-block:: yaml
-
-        # validators.en.yml
-        author.name.not_blank: Please enter an author name.
-
 Translating Database Content
 ----------------------------
 

diff --git a/components/translation/usage.rst b/components/translation/usage.rst
@@ -127,18 +127,18 @@ recommended format. These files are parsed by one of the loader classes.
             </file>
         </xliff>
 
+    .. code-block:: yaml
+
+        Symfony2 is great: J'aime Symfony2
+        symfony2.great:    J'aime Symfony2
+
     .. code-block:: php
 
         return array(
             'Symfony2 is great' => 'J\'aime Symfony2',
             'symfony2.great'    => 'J\'aime Symfony2',
         );
 
-    .. code-block:: yaml
-
-        Symfony2 is great: J'aime Symfony2
-        symfony2.great:    J'aime Symfony2
-
 .. sidebar:: Using Real or Keyword Messages
 
     This example illustrates the two different philosophies when creating

diff --git a/contributing/documentation/standards.rst b/contributing/documentation/standards.rst
@@ -80,6 +80,7 @@ Configuration examples should show all supported formats using
 * **Configuration** (including services and routing): YAML, XML, PHP
 * **Validation**: YAML, Annotations, XML, PHP
 * **Doctrine Mapping**: Annotations, YAML, XML, PHP
+* **Translation**: XML, YAML, PHP
 
 Example
 ~~~~~~~