wzray/tt9
1
0
Fork 0
Code Activity

Farsi language

Browse source
This commit is contained in:
sspanak 2025-02-12 17:53:14 +02:00 • committed by Dimo Karaivanov
parent ffae563b95
commit 2098b1a994
9 changed files with 562357 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/io/github/sspanak/tt9/languages/LanguageKind.java
View file

@ -7,10 +7,11 @@ public class LanguageKind {
public static boolean isCyrillic(Language language) { return language != null && language.getKeyCharacters(2).contains("а"); }
public static boolean isLatinBased(Language language) { return language != null && language.getKeyCharacters(2).contains("a"); }
public static boolean isRTL(Language language) { return isArabic(language) || isHebrew(language); }
public static boolean isRTL(Language language) { return isArabic(language) || isFarsi(language) || isHebrew(language); }
public static boolean isArabic(Language language) { return language != null && language.getId() == 502337; }
public static boolean isEnglish(Language language) { return language != null && language.getLocale().equals(Locale.ENGLISH); }
public static boolean isFarsi(Language language) { return language != null && language.getId() == 599078; }
public static boolean isFrench(Language language) { return language != null && language.getId() == 596550; }
public static boolean isGreek(Language language) { return language != null && language.getId() == 597381; }
public static boolean isGujarati(Language language) { return language != null && language.getId() == 468647; }

1
app/src/main/java/io/github/sspanak/tt9/languages/NaturalLanguage.java
View file

@ -86,6 +86,7 @@ public class NaturalLanguage extends Language implements Comparable<NaturalLangu
specialChars.put(SPECIAL_CHARS_PLACEHOLDER, Characters.Special);
specialChars.put(PUNCTUATION_PLACEHOLDER, Characters.PunctuationEnglish);
specialChars.put(PUNCTUATION_PLACEHOLDER + "_AR", Characters.PunctuationArabic);
specialChars.put(PUNCTUATION_PLACEHOLDER + "_FA", Characters.PunctuationFarsi);
specialChars.put(PUNCTUATION_PLACEHOLDER + "_FR", Characters.PunctuationFrench);
specialChars.put(PUNCTUATION_PLACEHOLDER + "_DE", Characters.PunctuationGerman);
specialChars.put(PUNCTUATION_PLACEHOLDER + "_GR", Characters.PunctuationGreek);

2
app/src/main/java/io/github/sspanak/tt9/ui/tray/SuggestionsBar.java
View file

@ -229,6 +229,7 @@ public class SuggestionsBar {
char firstChar = trimmedSuggestion.charAt(0);
String prefix = Character.isAlphabetic(firstChar) && !Characters.isCombiningPunctuation(firstChar) ? STEM_VARIATION_PREFIX : STEM_PUNCTUATION_VARIATION_PREFIX;
prefix = Characters.isFathatan(firstChar) ? " " : prefix; // Fix incorrect display of fathatan without a base character. It is a combining character, but since it is a letter, we must include a base character not to break it, with a "..." prefix
suggestions.add(prefix + formatUnreadableSuggestion(trimmedSuggestion));
return;
}
@ -251,7 +252,6 @@ public class SuggestionsBar {
}
private void setSuggestionsOnScreen() {
if (mView != null) {
mSuggestionsAdapter.resetItems(selectedIndex);

4
app/src/main/java/io/github/sspanak/tt9/util/chars/Characters.java
View file

@ -48,4 +48,8 @@ public class Characters extends Emoji {
public static boolean isCurrency(Language language, String c) {
return Currency.contains(c) || (language != null && language.getCurrency().equals(c));
}
public static boolean isFathatan(char ch) {
return ch == 0x064B;
}
}

11
app/src/main/java/io/github/sspanak/tt9/util/chars/Punctuation.java
View file

@ -21,6 +21,10 @@ class Punctuation {
',', '-', '\'', ':', ';', '!', '?', '.'
));
final public static ArrayList<Character> CombiningPunctuationFarsi = new ArrayList<>(Arrays.asList(
'،', ZWNJ.charAt(0), '-', '\'', ':', '؛', '!', '؟', '.'
));
final private static ArrayList<Character> CombiningPunctuationGujarati = new ArrayList<>(Arrays.asList(
'્', '઼', 'ઽ', 'ઃ', '।', '॰', '॥' // Indic combining chars look the same, but have different Unicode values
));
@ -41,6 +45,11 @@ class Punctuation {
",", ".", "-", "(", ")", "&", "~", "`", ";", ":", "'", "\"", "!", "?"
));
// the same as Arabic + ZWNJ
final public static ArrayList<String> PunctuationFarsi = new ArrayList<>(Arrays.asList(
"،", ".", "-", ZWNJ, "(", ")", "&", "~", "`", "'", "\"", "؛", ":", "!", "؟"
));
final public static ArrayList<String> PunctuationFrench = new ArrayList<>(Arrays.asList(
",", ".", "-", "«", "»", "(", ")", "&", "`", "~", ";", ":", "'", "\"", "!", "?"
));
@ -64,6 +73,7 @@ class Punctuation {
public static boolean isCombiningPunctuation(Language language, char ch) {
return
CombiningPunctuation.contains(ch)
|| (LanguageKind.isFarsi(language) && CombiningPunctuationFarsi.contains(ch))
|| (LanguageKind.isGujarati(language) && CombiningPunctuationGujarati.contains(ch))
|| (LanguageKind.isHindi(language) && CombiningPunctuationHindi.contains(ch))
|| (LanguageKind.isHebrew(language) && CombiningPunctuationHebrew.contains(ch));
@ -72,6 +82,7 @@ class Punctuation {
public static boolean isCombiningPunctuation(char ch) {
return
CombiningPunctuation.contains(ch)
|| CombiningPunctuationFarsi.contains(ch)
|| CombiningPunctuationGujarati.contains(ch)
|| CombiningPunctuationHindi.contains(ch)
|| CombiningPunctuationHebrew.contains(ch);