Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-alpha1

Change-Id: Ib2e0f6c524f72a6048ce4880fcd5494a26a0d199

1 files changed, 4 insertions, 1 deletions

diff --git a/src/virtualkeyboard/t9writeinputmethod.cpp b/src/virtualkeyboard/t9writeinputmethod.cpp
index c3e9ce17..341b011d 100644
--- a/src/virtualkeyboard/t9writeinputmethod.cpp
+++ b/src/virtualkeyboard/t9writeinputmethod.cpp
@@ -296,7 +296,7 @@ public:
 
         int isLanguageSupported = 0;
         decumaDatabaseIsLanguageSupported(sessionSettings.pStaticDB, language, &isLanguageSupported);
-        if (language == DECUMA_LANG_GSMDEFAULT) {
+        if (!isLanguageSupported) {
             qWarning() << "Handwriting input does not support the language" << locale.name();
             return false;
         }
@@ -346,6 +346,9 @@ public:
                     symbolCategories.append(DECUMA_CATEGORY_BASIC_PUNCTUATIONS);
                     symbolCategories.append(DECUMA_CATEGORY_CONTRACTION_MARK);
                 }
+
+                if (language == DECUMA_LANG_ES)
+                    symbolCategories.append(DECUMA_CATEGORY_SPANISH_PUNCTUATIONS);
             }
             break;