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

List:       kde-i18n-doc
Subject:    Re: Remaining plural forms problem in koffice.po
From:       Stefan =?iso-8859-1?q?Asserh=E4ll?= <stefan.asserhall () telia ! com>
Date:       2002-06-29 14:33:25
[Download RAW message or body]

On Saturday 29 June 2002 16.20, Stefan Asserhäll wrote:
> I noticed that a problem with trailing "\n" for plural forms remained
> in "koffice.po". Here is a patch to "koffice/lib/kofficeui/koReplace.cc"
> to fix it.
Answering myself: I also noticed (after sending the previous mail) that 
the same code is in "kdelibs/kutils/kreplace.cpp". I fixed that too. Here 
is the patch.

BTW, I think code duplication is a *bad thing*. Should something be 
done about it?

Same question as before: Ok to commit to CVS?

/ Stefan Asserhäll

["kreplace.diff" (text/x-diff)]

Index: kreplace.cpp
===================================================================
RCS file: /home/kde/kdelibs/kutils/kreplace.cpp,v
retrieving revision 1.2
diff -u -3 -p -r1.2 kreplace.cpp
--- kreplace.cpp	24 Jun 2002 06:57:38 -0000	1.2
+++ kreplace.cpp	29 Jun 2002 14:15:53 -0000
@@ -57,7 +57,7 @@ KReplace::~KReplace()
         if ( !m_replacements )
             KMessageBox::information(parentWidget(), i18n("No text was replaced."));
         else
-            KMessageBox::information(parentWidget(), i18n("1 replacement done.\n", \
"%n replacements done.\n", m_replacements ) ); +            \
KMessageBox::information(parentWidget(), i18n("1 replacement done.", "%n replacements \
done.", m_replacements ) );  
     }
     setDisplayFinalDialog( false ); // don't display the KFind dialog :)
@@ -212,12 +212,13 @@ bool KReplace::shouldRestart( bool force
          && (m_options & KReplaceDialog::PromptOnReplace) == 0 )
         return false;
     QString message;
-    if ( m_replacements )
-        message = i18n("1 replacement done.\n", "%n replacements done.\n", \
m_replacements ); +    if ( !m_replacements )
+        message = i18n("No text was replaced.");
     else
-        message = i18n("No replacement done.\n");
+        message = i18n("1 replacement done.", "%n replacements done.", \
m_replacements );  
     // Hope this word puzzle is ok, it's a different sentence
+    message += "\n";
     message += i18n("Do you want to restart search at the beginning?");
 
     int ret = KMessageBox::questionYesNo( parentWidget(), message );



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