correct writing direction for Farsi

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61340 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/misc/languages/langtabl.txt b/misc/languages/langtabl.txt
index e0b61abb003a839517886eda0a74fc33f2213639..4a362d73721650968c37fd385a250c1a7b96f3a2 100644 (file)
--- a/misc/languages/langtabl.txt
+++ b/misc/languages/langtabl.txt
@@ -3,24 +3,24 @@ wxLANGUAGE_AFAR                        aa     -                -
 wxLANGUAGE_AFRIKAANS                   af_ZA  LANG_AFRIKAANS   SUBLANG_DEFAULT                     LTR    "Afrikaans"
 wxLANGUAGE_ALBANIAN                    sq_AL  LANG_ALBANIAN    SUBLANG_DEFAULT                     LTR    "Albanian"
 wxLANGUAGE_AMHARIC                     am     -                -                                   LTR    "Amharic"
 wxLANGUAGE_AFRIKAANS                   af_ZA  LANG_AFRIKAANS   SUBLANG_DEFAULT                     LTR    "Afrikaans"
 wxLANGUAGE_ALBANIAN                    sq_AL  LANG_ALBANIAN    SUBLANG_DEFAULT                     LTR    "Albanian"
 wxLANGUAGE_AMHARIC                     am     -                -                                   LTR    "Amharic"

-wxLANGUAGE_ARABIC                      ar     LANG_ARABIC      SUBLANG_DEFAULT                     RTL     "Arabic"
-wxLANGUAGE_ARABIC_ALGERIA              ar_DZ  LANG_ARABIC      SUBLANG_ARABIC_ALGERIA              RTL     "Arabic (Algeria)"
-wxLANGUAGE_ARABIC_BAHRAIN              ar_BH  LANG_ARABIC      SUBLANG_ARABIC_BAHRAIN              RTL     "Arabic (Bahrain)"
-wxLANGUAGE_ARABIC_EGYPT                ar_EG  LANG_ARABIC      SUBLANG_ARABIC_EGYPT                RTL     "Arabic (Egypt)"
-wxLANGUAGE_ARABIC_IRAQ                 ar_IQ  LANG_ARABIC      SUBLANG_ARABIC_IRAQ                 RTL     "Arabic (Iraq)"
-wxLANGUAGE_ARABIC_JORDAN               ar_JO  LANG_ARABIC      SUBLANG_ARABIC_JORDAN               RTL     "Arabic (Jordan)"
-wxLANGUAGE_ARABIC_KUWAIT               ar_KW  LANG_ARABIC      SUBLANG_ARABIC_KUWAIT               RTL     "Arabic (Kuwait)"
-wxLANGUAGE_ARABIC_LEBANON              ar_LB  LANG_ARABIC      SUBLANG_ARABIC_LEBANON              RTL     "Arabic (Lebanon)"
-wxLANGUAGE_ARABIC_LIBYA                ar_LY  LANG_ARABIC      SUBLANG_ARABIC_LIBYA                RTL     "Arabic (Libya)"
-wxLANGUAGE_ARABIC_MOROCCO              ar_MA  LANG_ARABIC      SUBLANG_ARABIC_MOROCCO              RTL     "Arabic (Morocco)"
-wxLANGUAGE_ARABIC_OMAN                 ar_OM  LANG_ARABIC      SUBLANG_ARABIC_OMAN                 RTL     "Arabic (Oman)"
-wxLANGUAGE_ARABIC_QATAR                ar_QA  LANG_ARABIC      SUBLANG_ARABIC_QATAR                RTL     "Arabic (Qatar)"
-wxLANGUAGE_ARABIC_SAUDI_ARABIA         ar_SA  LANG_ARABIC      SUBLANG_ARABIC_SAUDI_ARABIA         RTL     "Arabic (Saudi Arabia)"
-wxLANGUAGE_ARABIC_SUDAN                ar_SD  -                -                                   RTL     "Arabic (Sudan)"
-wxLANGUAGE_ARABIC_SYRIA                ar_SY  LANG_ARABIC      SUBLANG_ARABIC_SYRIA                RTL     "Arabic (Syria)"
-wxLANGUAGE_ARABIC_TUNISIA              ar_TN  LANG_ARABIC      SUBLANG_ARABIC_TUNISIA              RTL     "Arabic (Tunisia)"
-wxLANGUAGE_ARABIC_UAE                  ar_AE  LANG_ARABIC      SUBLANG_ARABIC_UAE                  RTL     "Arabic (Uae)"
-wxLANGUAGE_ARABIC_YEMEN                ar_YE  LANG_ARABIC      SUBLANG_ARABIC_YEMEN                RTL     "Arabic (Yemen)"
+wxLANGUAGE_ARABIC                      ar     LANG_ARABIC      SUBLANG_DEFAULT                     RTL    "Arabic"
+wxLANGUAGE_ARABIC_ALGERIA              ar_DZ  LANG_ARABIC      SUBLANG_ARABIC_ALGERIA              RTL    "Arabic (Algeria)"
+wxLANGUAGE_ARABIC_BAHRAIN              ar_BH  LANG_ARABIC      SUBLANG_ARABIC_BAHRAIN              RTL    "Arabic (Bahrain)"
+wxLANGUAGE_ARABIC_EGYPT                ar_EG  LANG_ARABIC      SUBLANG_ARABIC_EGYPT                RTL    "Arabic (Egypt)"
+wxLANGUAGE_ARABIC_IRAQ                 ar_IQ  LANG_ARABIC      SUBLANG_ARABIC_IRAQ                 RTL    "Arabic (Iraq)"
+wxLANGUAGE_ARABIC_JORDAN               ar_JO  LANG_ARABIC      SUBLANG_ARABIC_JORDAN               RTL    "Arabic (Jordan)"
+wxLANGUAGE_ARABIC_KUWAIT               ar_KW  LANG_ARABIC      SUBLANG_ARABIC_KUWAIT               RTL    "Arabic (Kuwait)"
+wxLANGUAGE_ARABIC_LEBANON              ar_LB  LANG_ARABIC      SUBLANG_ARABIC_LEBANON              RTL    "Arabic (Lebanon)"
+wxLANGUAGE_ARABIC_LIBYA                ar_LY  LANG_ARABIC      SUBLANG_ARABIC_LIBYA                RTL    "Arabic (Libya)"
+wxLANGUAGE_ARABIC_MOROCCO              ar_MA  LANG_ARABIC      SUBLANG_ARABIC_MOROCCO              RTL    "Arabic (Morocco)"
+wxLANGUAGE_ARABIC_OMAN                 ar_OM  LANG_ARABIC      SUBLANG_ARABIC_OMAN                 RTL    "Arabic (Oman)"
+wxLANGUAGE_ARABIC_QATAR                ar_QA  LANG_ARABIC      SUBLANG_ARABIC_QATAR                RTL    "Arabic (Qatar)"
+wxLANGUAGE_ARABIC_SAUDI_ARABIA         ar_SA  LANG_ARABIC      SUBLANG_ARABIC_SAUDI_ARABIA         RTL    "Arabic (Saudi Arabia)"
+wxLANGUAGE_ARABIC_SUDAN                ar_SD  -                -                                   RTL    "Arabic (Sudan)"
+wxLANGUAGE_ARABIC_SYRIA                ar_SY  LANG_ARABIC      SUBLANG_ARABIC_SYRIA                RTL    "Arabic (Syria)"
+wxLANGUAGE_ARABIC_TUNISIA              ar_TN  LANG_ARABIC      SUBLANG_ARABIC_TUNISIA              RTL    "Arabic (Tunisia)"
+wxLANGUAGE_ARABIC_UAE                  ar_AE  LANG_ARABIC      SUBLANG_ARABIC_UAE                  RTL    "Arabic (Uae)"
+wxLANGUAGE_ARABIC_YEMEN                ar_YE  LANG_ARABIC      SUBLANG_ARABIC_YEMEN                RTL    "Arabic (Yemen)"

 wxLANGUAGE_ARMENIAN                    hy     LANG_ARMENIAN    SUBLANG_DEFAULT                     LTR    "Armenian"
 wxLANGUAGE_ASSAMESE                    as     LANG_ASSAMESE    SUBLANG_DEFAULT                     LTR    "Assamese"
 wxLANGUAGE_ASTURIAN                    ast    -                -                                   LTR    "Asturian"
 wxLANGUAGE_ARMENIAN                    hy     LANG_ARMENIAN    SUBLANG_DEFAULT                     LTR    "Armenian"
 wxLANGUAGE_ASSAMESE                    as     LANG_ASSAMESE    SUBLANG_DEFAULT                     LTR    "Assamese"
 wxLANGUAGE_ASTURIAN                    ast    -                -                                   LTR    "Asturian"


@@ -72,7 +72,7 @@ wxLANGUAGE_ENGLISH_ZIMBABWE            en_ZW  LANG_ENGLISH     SUBLANG_ENGLISH_Z
 wxLANGUAGE_ESPERANTO                   eo     -                -                                   LTR    "Esperanto"
 wxLANGUAGE_ESTONIAN                    et_EE  LANG_ESTONIAN    SUBLANG_DEFAULT                     LTR    "Estonian"
 wxLANGUAGE_FAEROESE                    fo_FO  LANG_FAEROESE    SUBLANG_DEFAULT                     LTR    "Faeroese"
 wxLANGUAGE_ESPERANTO                   eo     -                -                                   LTR    "Esperanto"
 wxLANGUAGE_ESTONIAN                    et_EE  LANG_ESTONIAN    SUBLANG_DEFAULT                     LTR    "Estonian"
 wxLANGUAGE_FAEROESE                    fo_FO  LANG_FAEROESE    SUBLANG_DEFAULT                     LTR    "Faeroese"

-wxLANGUAGE_FARSI                       fa_IR  LANG_FARSI       SUBLANG_DEFAULT                     LTR    "Farsi"
+wxLANGUAGE_FARSI                       fa_IR  LANG_FARSI       SUBLANG_DEFAULT                     RTL    "Farsi"

 wxLANGUAGE_FIJI                        fj     -                -                                   LTR    "Fiji"
 wxLANGUAGE_FINNISH                     fi_FI  LANG_FINNISH     SUBLANG_DEFAULT                     LTR    "Finnish"
 wxLANGUAGE_FRENCH                      fr_FR  LANG_FRENCH      SUBLANG_FRENCH                      LTR    "French"
 wxLANGUAGE_FIJI                        fj     -                -                                   LTR    "Fiji"
 wxLANGUAGE_FINNISH                     fi_FI  LANG_FINNISH     SUBLANG_DEFAULT                     LTR    "Finnish"
 wxLANGUAGE_FRENCH                      fr_FR  LANG_FRENCH      SUBLANG_FRENCH                      LTR    "French"


@@ -95,7 +95,7 @@ wxLANGUAGE_GREENLANDIC                 kl_GL  -                -
 wxLANGUAGE_GUARANI                     gn     -                -                                   LTR    "Guarani"
 wxLANGUAGE_GUJARATI                    gu     LANG_GUJARATI    SUBLANG_DEFAULT                     LTR    "Gujarati"
 wxLANGUAGE_HAUSA                       ha     -                -                                   LTR    "Hausa"
 wxLANGUAGE_GUARANI                     gn     -                -                                   LTR    "Guarani"
 wxLANGUAGE_GUJARATI                    gu     LANG_GUJARATI    SUBLANG_DEFAULT                     LTR    "Gujarati"
 wxLANGUAGE_HAUSA                       ha     -                -                                   LTR    "Hausa"

-wxLANGUAGE_HEBREW                      he_IL  LANG_HEBREW      SUBLANG_DEFAULT                     RTL     "Hebrew"
+wxLANGUAGE_HEBREW                      he_IL  LANG_HEBREW      SUBLANG_DEFAULT                     RTL    "Hebrew"

 wxLANGUAGE_HINDI                       hi_IN  LANG_HINDI       SUBLANG_DEFAULT                     LTR    "Hindi"
 wxLANGUAGE_HUNGARIAN                   hu_HU  LANG_HUNGARIAN   SUBLANG_DEFAULT                     LTR    "Hungarian"
 wxLANGUAGE_ICELANDIC                   is_IS  LANG_ICELANDIC   SUBLANG_DEFAULT                     LTR    "Icelandic"
 wxLANGUAGE_HINDI                       hi_IN  LANG_HINDI       SUBLANG_DEFAULT                     LTR    "Hindi"
 wxLANGUAGE_HUNGARIAN                   hu_HU  LANG_HUNGARIAN   SUBLANG_DEFAULT                     LTR    "Hungarian"
 wxLANGUAGE_ICELANDIC                   is_IS  LANG_ICELANDIC   SUBLANG_DEFAULT                     LTR    "Icelandic"

diff --git a/src/common/intl.cpp b/src/common/intl.cpp
index 1a750a6d1a03b7ca8c6637de588cb28470661670..978b4b41e511628bb87af6fae2fdd0074e7e1c7a 100644 (file)
--- a/src/common/intl.cpp
+++ b/src/common/intl.cpp
@@ -3787,7 +3787,7 @@ void wxLocale::InitLanguagesDB()
    LNG(wxLANGUAGE_ESPERANTO,                  "eo"   , 0              , 0                                 , wxLayout_LeftToRight, "Esperanto")
    LNG(wxLANGUAGE_ESTONIAN,                   "et_EE", LANG_ESTONIAN  , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Estonian")
    LNG(wxLANGUAGE_FAEROESE,                   "fo_FO", LANG_FAEROESE  , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Faeroese")
    LNG(wxLANGUAGE_ESPERANTO,                  "eo"   , 0              , 0                                 , wxLayout_LeftToRight, "Esperanto")
    LNG(wxLANGUAGE_ESTONIAN,                   "et_EE", LANG_ESTONIAN  , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Estonian")
    LNG(wxLANGUAGE_FAEROESE,                   "fo_FO", LANG_FAEROESE  , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Faeroese")

-   LNG(wxLANGUAGE_FARSI,                      "fa_IR", LANG_FARSI     , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Farsi")
+   LNG(wxLANGUAGE_FARSI,                      "fa_IR", LANG_FARSI     , SUBLANG_DEFAULT                   , wxLayout_RightToLeft, "Farsi")

    LNG(wxLANGUAGE_FIJI,                       "fj"   , 0              , 0                                 , wxLayout_LeftToRight, "Fiji")
    LNG(wxLANGUAGE_FINNISH,                    "fi_FI", LANG_FINNISH   , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Finnish")
    LNG(wxLANGUAGE_FRENCH,                     "fr_FR", LANG_FRENCH    , SUBLANG_FRENCH                    , wxLayout_LeftToRight, "French")
    LNG(wxLANGUAGE_FIJI,                       "fj"   , 0              , 0                                 , wxLayout_LeftToRight, "Fiji")
    LNG(wxLANGUAGE_FINNISH,                    "fi_FI", LANG_FINNISH   , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Finnish")
    LNG(wxLANGUAGE_FRENCH,                     "fr_FR", LANG_FRENCH    , SUBLANG_FRENCH                    , wxLayout_LeftToRight, "French")