[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdeedu/kverbos/kverbos
From:       Anne-Marie Mahfouf <annma () kde ! org>
Date:       2004-07-04 2:27:04
Message-ID: 20040704022704.F3B5C99E9 () office ! kde ! org
[Download RAW message or body]

CVS commit by annma: 

make KVerbos work with English i.e. the translation of the Spanish verbs can now be \
in English and not only in German


  A            data/de/Makefile.am   1.1
  A            data/de/verbos.verbos   1.1
  A            data/en/Makefile.am   1.1
  A            data/en/verbos.verbos   1.1
  M +13 -6     kverbos.cpp   1.28
  M +1 -4      data/Makefile.am   1.2
  R            data/verbos.verbos   1.1


--- kdeedu/kverbos/kverbos/kverbos.cpp  #1.27:1.28
@@ -420,5 +420,12 @@ void KVerbosApp::slotFileOpenStandard()
 {
         slotStatusMsg(i18n("Opening file..."));
-
+        //get the user language
+        KConfigBase *globalConf = KGlobal::config();
+        globalConf->setGroup("Locale");
+        QString userLanguage = globalConf->readEntry("Language", "en");
+        //keep only the first 2 characters
+        userLanguage = userLanguage.left(2);
+        if (userLanguage!="de") 
+                userLanguage = "en";
         if(!doc->saveModified())
         {
@@ -428,5 +435,5 @@ void KVerbosApp::slotFileOpenStandard()
         else
         {
-                KURL url(locate("appdata", "data/verbos.verbos"));
+                KURL url(locate("appdata", "data/"+userLanguage+"/verbos.verbos"));
                 if(!url.isEmpty())
                 {
@@ -729,9 +736,9 @@ void KVerbosApp::getTimeOptions(bool op[
 void KVerbosApp::slotSettingsUsername()
 {
-        KLineEditDlg dlg(i18n("Please enter your name:"), QString::null, this);
-        dlg.setCaption(i18n("Enter User Name"));
-        if (dlg.exec())
+        KLineEditDlg kcfg_dlg(i18n("Please enter your name:"), QString::null, this);
+        kcfg_dlg.setCaption(i18n("Enter User Name"));
+        if (kcfg_dlg.exec())
         {
-                QString n = dlg.text().simplifyWhiteSpace();
+                QString n = kcfg_dlg.text().simplifyWhiteSpace();
                 if (!n.isEmpty())
                 {

--- kdeedu/kverbos/kverbos/data/Makefile.am  #1.1:1.2
@@ -1,4 +1 @@
-verbos_DATA = verbos.verbos
-
-verbosdir = $(kde_datadir)/kverbos/data
-
+SUBDIRS = $(AUTODIRS)


[prev in list] [next in list] [prev in thread] [next in thread]