diff options
| author |   Jean Chalard <jchalard@google.com> | 2013-01-17 09:07:20 +0000 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2013-01-17 09:07:20 +0000 |
| commit | 15ea1d40967c25ab27849e1d8c0acf55d8f07e29 (patch) | |
| tree | e1ffc0a6dc90d2752099edfead3aafb4f28ed2f8 /java/res | |
| parent | 40c59727cf3c1b07a60c28f8df64876eb8ea03e3 (diff) | |
| parent | ae3b96b26ef86a9f342b4aeb2047abdaac5e57a5 (diff) | |
| download | latinime-15ea1d40967c25ab27849e1d8c0acf55d8f07e29.tar.gz latinime-15ea1d40967c25ab27849e1d8c0acf55d8f07e29.tar.xz latinime-15ea1d40967c25ab27849e1d8c0acf55d8f07e29.zip | |
Merge "Simplify the space-before and space-after logic."
Diffstat (limited to 'java/res')
| -rw-r--r-- | java/res/values-fr/donottranslate.xml | 18 | ||||
| -rw-r--r-- | java/res/values/donottranslate.xml | 19 |
2 files changed, 16 insertions, 21 deletions
diff --git a/java/res/values-fr/donottranslate.xml b/java/res/values-fr/donottranslate.xml index e11e65c79..2e916a734 100644 --- a/java/res/values-fr/donottranslate.xml +++ b/java/res/values-fr/donottranslate.xml @@ -18,15 +18,13 @@ */ --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <!-- Symbols that should be swapped with a magic space --> - <string name="weak_space_swapping_symbols">.,)]}</string> - <!-- Symbols that should strip a magic space --> + <!-- Symbols that are normally preceded by a space (used to add an auto-space before these) --> + <string name="symbols_preceded_by_space">([{*&;:!?</string> + <!-- Symbols that are normally followed by a space (used to add an auto-space after these) --> + <string name="symbols_followed_by_space">.,;:!?)]}*&</string> + <!-- Symbols that separate words --> <!-- Don't remove the enclosing double quotes, they protect whitespace (not just U+0020) --> - <string name="weak_space_stripping_symbols">"	 \n"\'-/_\"</string> - <!-- Symbols that should promote magic spaces into real space --> - <string name="phantom_space_promoting_symbols">;:!?([*&@{<>+=|</string> - <!-- Symbols that do NOT separate words --> - <!-- Note that this is identical to the default value, but since the above ones are different - and those variables only make sense together, this is kept here for readability. --> - <string name="symbols_excluded_from_word_separators">\'-</string> + <string name="symbols_word_separators">"	 \n"()[]{}*&<>+=|.,;:!?/_\"</string> + <!-- Word connectors --> + <string name="symbols_word_connectors">\'-</string> </resources> diff --git a/java/res/values/donottranslate.xml b/java/res/values/donottranslate.xml index 193a0191e..70ace776f 100644 --- a/java/res/values/donottranslate.xml +++ b/java/res/values/donottranslate.xml @@ -20,18 +20,15 @@ <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <!-- Symbols that are suggested between words --> <string name="suggested_punctuations">!,?,\\,,:,;,\",(,),\',-,/,@,_</string> - <!-- Symbols that should be swapped with a weak space --> - <string name="weak_space_swapping_symbols">.,;:!?)]}</string> - <!-- Symbols that should strip a weak space --> + <!-- Symbols that are normally preceded by a space (used to add an auto-space before these) --> + <string name="symbols_preceded_by_space">([{*&</string> + <!-- Symbols that are normally followed by a space (used to add an auto-space after these) --> + <string name="symbols_followed_by_space">.,;:!?)]}*&</string> + <!-- Symbols that separate words --> <!-- Don't remove the enclosing double quotes, they protect whitespace (not just U+0020) --> - <string name="weak_space_stripping_symbols">"	 \n"/_\'-@\"</string> - <!-- Symbols that should convert weak spaces into real space --> - <string name="phantom_space_promoting_symbols">([*&{<>+=|</string> - <!-- Symbols that do NOT separate words --> - <string name="symbols_excluded_from_word_separators">\'-</string> - <!-- Word separator list is the union of all symbols except those that are not separators: - weak_space_swapping_symbols | weak_space_stripping_symbols - \ symbols_excluded_from_word_separators --> + <string name="symbols_word_separators">"	 \n"()[]{}*&<>+=|.,;:!?/_\"</string> + <!-- Word connectors --> + <string name="symbols_word_connectors">\'-</string> <!-- Symbol characters list that should switch back to the main layout --> <!-- U+2018: "‘" LEFT SINGLE QUOTATION MARK U+2019: "’" RIGHT SINGLE QUOTATION MARK |