Merge branch '4.4' into 5.0

wouterj · wouterj · commit 38b8860fefcc · 2019-11-23T15:50:16.000+01:00
* 4.4: [#12400] Added tip about ranges in the new ICU message format Revert "[Transalation] Document range translation using the ICU MessageFormat" [Transalation] Document range translation using the ICU MessageFormat fix typo
diff --git a/setup/upgrade_major.rst b/setup/upgrade_major.rst
@@ -144,7 +144,7 @@ mentions of ``4.*`` to ``5.0.*``:
     }
 
 At the bottom of your ``composer.json`` file, in the ``extra`` block you can
-find a data setting for the symfony version. Make sure to also upgrade
+find a data setting for the Symfony version. Make sure to also upgrade
 this one. For instance, update it to ``5.0.*`` to upgrade to Symfony 5.0:
 
 .. code-block:: json
diff --git a/translation/message_format.rst b/translation/message_format.rst
@@ -263,6 +263,27 @@ Usage of this string is the same as with variables and select::
             }
         }
 
+.. sidebar:: Using Ranges in Messages
+
+    The pluralization in the legacy Symfony syntax could be used with custom
+    ranges (e.g. have a different messages for 0-12, 12-40 and 40+). The ICU
+    message format does not have this feature. Instead, this logic should be
+    moved to PHP code::
+
+        // Instead of
+        $message = $translator->trans('balance_message', $balance);
+        // with a message like:
+        // ]-Inf,0]Oops! I'm down|]0,1000]I still have money|]1000,Inf]I have lots of money
+
+        // use three different messages for each range:
+        if ($balance < 0) {
+            $message = $translator->trans('no_money_message');
+        } elseif ($balance < 1000) {
+            $message = $translator->trans('some_money_message');
+        } else {
+            $message = $translator->trans('lots_of_money_message');
+        }
+
 Additional Placeholder Functions
 --------------------------------
 

Original file line number	Diff line number	Diff line change
@@ -144,7 +144,7 @@ mentions of ``4.`` to ``5.0.``:
`144`	`144`	`}`
`145`	`145`
`146`	`146`	At the bottom of your ``composer.json`` file, in the ``extra`` block you can
`147`		`-find a data setting for the symfony version. Make sure to also upgrade`
	`147`	`+find a data setting for the Symfony version. Make sure to also upgrade`
`148`	`148`	this one. For instance, update it to ``5.0.*`` to upgrade to Symfony 5.0:
`149`	`149`
`150`	`150`	`.. code-block:: json`