SVN commit 989244 by ilic:

New methods for Transcript interface: localeCountry, localeModifier. (bport: 989243)

 M  +6 -2      klocalizedstring.cpp  
 M  +26 -11    ktranscript.cpp  
 M  +4 -2      ktranscript_p.h  


--- branches/KDE/4.3/kdelibs/kdecore/localization/klocalizedstring.cpp #989243:989244
@@ -683,9 +683,11 @@
     // Evaluate interpolation.
     QString msgctxt = QString::fromUtf8(ctxt);
     QString msgid = QString::fromUtf8(msg);
+    QString ctry = KGlobal::locale()->country();
     QString scriptError;
     bool fallbackLocal;
-    result = s->ktrs->eval(iargs, lang, lscr, msgctxt, dynctxt, msgid,
+    result = s->ktrs->eval(iargs, lang, lscr, ctry,
+                           msgctxt, dynctxt, msgid,
                            args, vals, final, s->scriptModulesToLoad,
                            scriptError, fallbackLocal);
     // s->scriptModulesToLoad will be cleared during the call.
@@ -753,9 +755,11 @@
     iargs.append(pcall);
     QString msgctxt = QString::fromUtf8(ctxt);
     QString msgid = QString::fromUtf8(msg);
+    QString ctry = KGlobal::locale()->country();
     QString scriptError;
     bool fallback;
-    QString dummy = s->ktrs->eval(iargs, lang, lscr, msgctxt, dynctxt, msgid,
+    QString dummy = s->ktrs->eval(iargs, lang, lscr, ctry,
+                                  msgctxt, dynctxt, msgid,
                                   args, vals, final, s->scriptModulesToLoad,
                                   scriptError, fallback);
     // s->scriptModulesToLoad will be cleared during the call.
--- branches/KDE/4.3/kdelibs/kdecore/localization/ktranscript.cpp #989243:989244
@@ -62,7 +62,8 @@
 
     QString eval (const QList<QVariant> &argv,
                   const QString &lang,
-                  const QString &lscr,
+                  const QString &modf,
+                  const QString &ctry,
                   const QString &msgctxt,
                   const QHash<QString, QString> &dynctxt,
                   const QString &msgid,
@@ -113,7 +114,8 @@
     JSValue *msgkeyf (ExecState *exec);
     JSValue *msgstrff (ExecState *exec);
     JSValue *dbgputsf (ExecState *exec, JSValue *str);
-    JSValue *lscrf (ExecState *exec);
+    JSValue *localeModifierf (ExecState *exec);
+    JSValue *localeCountryf (ExecState *exec);
     JSValue *normKeyf (ExecState *exec, JSValue *phrase);
     JSValue *loadPropsf (ExecState *exec, const List &fnames);
     JSValue *getPropf (ExecState *exec, JSValue *phrase, JSValue *prop);
@@ -140,7 +142,8 @@
         Msgkey,
         Msgstrf,
         Dbgputs,
-        Lscr,
+        LocaleModifier,
+        LocaleCountry,
         NormKey,
         LoadProps,
         GetProp,
@@ -176,7 +179,8 @@
     const QStringList *subs;
     const QList<QVariant> *vals;
     const QString *final;
-    const QString *lscr;
+    const QString *modf;
+    const QString *ctry;
 
     // Fallback request handle.
     bool *fallback;
@@ -453,7 +457,8 @@
 
 QString KTranscriptImp::eval (const QList<QVariant> &argv,
                               const QString &lang,
-                              const QString &lscr,
+                              const QString &modf,
+                              const QString &ctry,
                               const QString &msgctxt,
                               const QHash<QString, QString> &dynctxt,
                               const QString &msgid,
@@ -513,7 +518,8 @@
     sface->vals = &vals;
     sface->final = &final;
     sface->fallback = &fallback;
-    sface->lscr = &lscr;
+    sface->modf = &modf;
+    sface->ctry = &ctry;
 
     // Find corresponding JS function.
     int argc = argv.size();
@@ -692,7 +698,8 @@
     msgkey          Scriptface::Msgkey          DontDelete|ReadOnly|Function 0
     msgstrf         Scriptface::Msgstrf         DontDelete|ReadOnly|Function 0
     dbgputs         Scriptface::Dbgputs         DontDelete|ReadOnly|Function 1
-    lscr            Scriptface::Lscr            DontDelete|ReadOnly|Function 0
+    localeModifier  Scriptface::LocaleModifier  DontDelete|ReadOnly|Function 0
+    localeCountry   Scriptface::LocaleCountry   DontDelete|ReadOnly|Function 0
     normKey         Scriptface::NormKey         DontDelete|ReadOnly|Function 1
     loadProps       Scriptface::LoadProps       DontDelete|ReadOnly|Function 0
     getProp         Scriptface::GetProp         DontDelete|ReadOnly|Function 2
@@ -787,8 +794,10 @@
             return obj->msgstrff(exec);
         case Scriptface::Dbgputs:
             return obj->dbgputsf(exec, CALLARG(0));
-        case Scriptface::Lscr:
-            return obj->lscrf(exec);
+        case Scriptface::LocaleModifier:
+            return obj->localeModifierf(exec);
+        case Scriptface::LocaleCountry:
+            return obj->localeCountryf(exec);
         case Scriptface::NormKey:
             return obj->normKeyf(exec, CALLARG(0));
         case Scriptface::LoadProps:
@@ -1072,12 +1081,18 @@
     return jsUndefined();
 }
 
-JSValue *Scriptface::lscrf (ExecState *exec)
+JSValue *Scriptface::localeModifierf (ExecState *exec)
 {
     Q_UNUSED(exec);
-    return jsString(*lscr);
+    return jsString(*modf);
 }
 
+JSValue *Scriptface::localeCountryf (ExecState *exec)
+{
+    Q_UNUSED(exec);
+    return jsString(*ctry);
+}
+
 JSValue *Scriptface::normKeyf (ExecState *exec, JSValue *phrase)
 {
     if (!phrase->isString()) {
--- branches/KDE/4.3/kdelibs/kdecore/localization/ktranscript_p.h #989243:989244
@@ -44,7 +44,8 @@
      *
      * @param argv list of interpolation tokens
      * @param lang language of the translation
-     * @param lscr script of the translation
+     * @param modf locale modifier
+     * @param ctry locale country
      * @param msgctxt message context
      * @param dynctxt dynamic context
      * @param msgid original message
@@ -61,7 +62,8 @@
      */
     virtual QString eval (const QList<QVariant> &argv,
                           const QString &lang,
-                          const QString &lscr,
+                          const QString &modf,
+                          const QString &ctry,
                           const QString &msgctxt,
                           const QHash<QString, QString> &dynctxt,
                           const QString &msgid,