Attachment 25039 Details for Bug 62276

[patch] gnome-xml-support-for-kdoctools-part2.diff

gnome-xml-support-for-kdoctools-part2.diff (text/plain), 1.78 KB, created by Chris Lahey on 2004-10-15 08:31:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Lahey

Created: 2004-10-15 08:31:39 UTC

Size: 1.78 KB

patch

obsolete

>diff -pruN kdelibs-3.2.1-old/kdoctools/kio_help.cpp kdelibs-3.2.1/kdoctools/kio_help.cpp
>--- kdelibs-3.2.1-old/kdoctools/kio_help.cpp	2004-10-14 17:41:05.000000000 -0400
>+++ kdelibs-3.2.1/kdoctools/kio_help.cpp	2004-10-14 17:57:54.207876611 -0400
>@@ -55,7 +55,12 @@ QString HelpProtocol::langLookup(QString
>     kdDebug( 7119 ) << "Looking up help for: " << fname << endl;
> 
>     QString path;
>-    int slash = fname.findRev ('/');
>+    int i = -1;
>+    int slash = -1;
>+    while (i == slash) {
>+      i = slash + 1;
>+      slash = fname.find ('/', i);
>+    }
>     if (slash == -1 || slash == 0) {
>       path = fname;
>       fname = "";
>@@ -67,18 +72,15 @@ QString HelpProtocol::langLookup(QString
>     QStringList langs = KGlobal::locale()->languageList();
>     QStringList::ConstIterator lang;
>     for (lang = langs.begin(); lang != langs.end(); ++lang)
>-        if (*lang == "en")
>+        if (*lang == "en" || *lang == "en_US")
> 	    search.append(QString("/opt/gnome/share/gnome/help/%1/C%2").arg(path).arg(fname));
>         else
> 	    search.append(QString("/opt/gnome/share/gnome/help/%1/%2%3").arg(path).arg(*lang).arg(fname));
> 
>-    langs.append( "en" );
>-    langs.remove( "C" );
>-
>     // this is kind of compat hack as we install our docs in en/ but the
>     // default language is en_US
>     for (QStringList::Iterator it = langs.begin(); it != langs.end(); ++it)
>-        if ( *it == "en_US" )
>+        if ( *it == "en_US" || *it == "C")
>             *it = "en";
> 
>     // look up the different languages
>@@ -136,7 +138,7 @@ QString HelpProtocol::lookupFile(const Q
>     result = langLookup(path);
>     if (result.isEmpty())
>     {
>-        result = langLookup(path+"/index.html");
>+        result = langLookup(path + "/index.html");
>         if (!result.isEmpty())
> 	{
>             KURL red( "help:/" );

Actions: View | Diff

Attachments on bug 62276: 25039 | 25355 | 25376 | 25421