Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d4469756 authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka Committed by Android (Google) Code Review
Browse files

Merge "Special punctuations for Arabic and Persian"

parents 17993ed4 d508b676

java/res/values-iw/config-spacing-and-punctuations.xml→java/res/values-ar-sw600dp/config-spacing-and-punctuations.xml

+4 −3
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
<!--

/*

**

** Copyright 2012, The Android Open Source Project

** Copyright 2014, The Android Open Source Project

**

** Licensed under the Apache License, Version 2.0 (the "License");

** you may not use this file except in compliance with the License.
@@ -21,6 +21,7 @@ 
    <!-- The all letters need to be mirrored are found at

         http://www.unicode.org/Public/6.1.0/ucd/BidiMirroring.txt -->

    <!-- Symbols that are suggested between words -->

    <!-- TODO: Use !text resources to merge LTR and RTL punctuations. -->

    <string name="suggested_punctuations" translatable="false">!,?,\\,,:,;,\",(|),)|(,\',-,/,@,_</string>

    <!-- U+061F: "؟" ARABIC QUESTION MARK

         U+061B: "؛" ARABIC SEMICOLON -->

    <string name="suggested_punctuations" translatable="false">!,&#x061F;,:,&#x061B;,\",\',(|),)|(,-,/,@,_</string>

</resources>

java/res/values-ar/config-spacing-and-punctuations.xml

+4 −2
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ 
    <!-- The all letters need to be mirrored are found at

         http://www.unicode.org/Public/6.1.0/ucd/BidiMirroring.txt -->

    <!-- Symbols that are suggested between words -->

    <!-- TODO: Use !text resources to merge LTR and RTL punctuations. -->

    <string name="suggested_punctuations" translatable="false">!,?,\\,,:,;,\",(|),)|(,\',-,/,@,_</string>

    <!-- U+061F: "؟" ARABIC QUESTION MARK

         U+060C: "،" ARABIC COMMA

         U+061B: "؛" ARABIC SEMICOLON -->

    <string name="suggested_punctuations" translatable="false">!,&#x061F;,&#x060C;,:,&#x061B;,\",(|),)|(,\',-,/,@,_</string>

</resources>

java/res/values-fa-sw600dp/config-spacing-and-punctuations.xml

0 → 100644
+27 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/*

**

** Copyright 2014, The Android Open Source Project

**

** Licensed under the Apache License, Version 2.0 (the "License");

** you may not use this file except in compliance with the License.

** You may obtain a copy of the License at

**

**     http://www.apache.org/licenses/LICENSE-2.0

**

** Unless required by applicable law or agreed to in writing, software

** distributed under the License is distributed on an "AS IS" BASIS,

** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

** See the License for the specific language governing permissions and

** limitations under the License.

*/

-->

<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <!-- The all letters need to be mirrored are found at

         http://www.unicode.org/Public/6.1.0/ucd/BidiMirroring.txt -->

    <!-- Symbols that are suggested between words -->

    <!-- U+061F: "؟" ARABIC QUESTION MARK

         U+061B: "؛" ARABIC SEMICOLON -->

    <string name="suggested_punctuations" translatable="false">!,&#x061F;,:,&#x061B;,\",\',(|),)|(,-,/,@,_</string>

</resources>

java/res/values-fa/config-spacing-and-punctuations.xml

+4 −2
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ 
    <!-- The all letters need to be mirrored are found at

         http://www.unicode.org/Public/6.1.0/ucd/BidiMirroring.txt -->

    <!-- Symbols that are suggested between words -->

    <!-- TODO: Use !text resources to merge LTR and RTL punctuations. -->

    <string name="suggested_punctuations" translatable="false">!,?,\\,,:,;,\",(|),)|(,\',-,/,@,_</string>

    <!-- U+061F: "؟" ARABIC QUESTION MARK

         U+060C: "،" ARABIC COMMA

         U+061B: "؛" ARABIC SEMICOLON -->

    <string name="suggested_punctuations" translatable="false">!,&#x061F;,&#x060C;,:,&#x061B;,\",(|),)|(,\',-,/,@,_</string>

</resources>

java/res/values-sw600dp/config-spacing-and-punctuations.xml

0 → 100644
+23 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/*

**

** Copyright 2014, The Android Open Source Project

**

** Licensed under the Apache License, Version 2.0 (the "License");

** you may not use this file except in compliance with the License.

** You may obtain a copy of the License at

**

**     http://www.apache.org/licenses/LICENSE-2.0

**

** Unless required by applicable law or agreed to in writing, software

** distributed under the License is distributed on an "AS IS" BASIS,

** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

** See the License for the specific language governing permissions and

** limitations under the License.

*/

-->

<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <!-- Symbols that are suggested between words -->

    <string name="suggested_punctuations" translatable="false">:,;,\",!text/keyspec_left_parenthesis,!text/keyspec_right_parenthesis,\',-,/,@,_</string>

</resources>