Attachment #25039 for bug #62276

View | Details | Raw Unified | Return to bug 62276
Collapse All | Expand All




    kdDebug( 7119 ) << "Looking up help for: " << fname << endl;

    QString path;
    int i = -1;
    int slash = -1;
    while (i == slash) {
      i = slash + 1;
      slash = fname.find ('/', i);
    }
    if (slash == -1 || slash == 0) {
      path = fname;
      fname = "";

    QStringList langs = KGlobal::locale()->languageList();
    QStringList::ConstIterator lang;
    for (lang = langs.begin(); lang != langs.end(); ++lang)
        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" || *it == "C")
            *it = "en";

    // look up the different languages

    result = langLookup(path);
    if (result.isEmpty())
    {
        result = langLookup(path + "/index.html");
        if (!result.isEmpty())
	{
            KURL red( "help:/" );

Return to bug 62276

Lines 55-61 QString HelpProtocol::langLookup(QString Link Here

(-)kdelibs-3.2.1-old/kdoctools/kio_help.cpp (-7 / +9 lines)
55	kdDebug( 7119 ) << "Looking up help for: " << fname << endl;	55	kdDebug( 7119 ) << "Looking up help for: " << fname << endl;
56		56
57	QString path;	57	QString path;
58	int slash = fname.findRev ('/');	58	int i = -1;
		59	int slash = -1;
		60	while (i == slash) {
		61	i = slash + 1;
		62	slash = fname.find ('/', i);
		63	}
59	if (slash == -1 \|\| slash == 0) {	64	if (slash == -1 \|\| slash == 0) {
60	path = fname;	65	path = fname;
61	fname = "";	66	fname = "";
Lines 67-84 QString HelpProtocol::langLookup(QString Link Here
67	QStringList langs = KGlobal::locale()->languageList();	72	QStringList langs = KGlobal::locale()->languageList();
68	QStringList::ConstIterator lang;	73	QStringList::ConstIterator lang;
69	for (lang = langs.begin(); lang != langs.end(); ++lang)	74	for (lang = langs.begin(); lang != langs.end(); ++lang)
70	if (*lang == "en")	75	if (lang == "en" \|\| lang == "en_US")
71	search.append(QString("/opt/gnome/share/gnome/help/%1/C%2").arg(path).arg(fname));	76	search.append(QString("/opt/gnome/share/gnome/help/%1/C%2").arg(path).arg(fname));
72	else	77	else
73	search.append(QString("/opt/gnome/share/gnome/help/%1/%2%3").arg(path).arg(*lang).arg(fname));	78	search.append(QString("/opt/gnome/share/gnome/help/%1/%2%3").arg(path).arg(*lang).arg(fname));
74		79
75	langs.append( "en" );
76	langs.remove( "C" );
77
78	// this is kind of compat hack as we install our docs in en/ but the	80	// this is kind of compat hack as we install our docs in en/ but the
79	// default language is en_US	81	// default language is en_US
80	for (QStringList::Iterator it = langs.begin(); it != langs.end(); ++it)	82	for (QStringList::Iterator it = langs.begin(); it != langs.end(); ++it)
81	if ( *it == "en_US" )	83	if ( it == "en_US" \|\| it == "C")
82	*it = "en";	84	*it = "en";
83		85
84	// look up the different languages	86	// look up the different languages
Lines 136-142 QString HelpProtocol::lookupFile(const Q Link Here
136	result = langLookup(path);	138	result = langLookup(path);
137	if (result.isEmpty())	139	if (result.isEmpty())
138	{	140	{
139	result = langLookup(path+"/index.html");	141	result = langLookup(path + "/index.html");
140	if (!result.isEmpty())	142	if (!result.isEmpty())
141	{	143	{
142	KURL red( "help:/" );	144	KURL red( "help:/" );