Attachment #1231 for bug #1499

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release. View | Details | Raw Unified | Return to bug 1499
Collapse All | Expand All




    char* name = libhal_volume_policy_compute_display_name(halDrive, halVolume, m_halStoragePolicy);
    TQString volume_name = TQString::fromUtf8(name);
    TQString media_name = volume_name;
    /* media_name contains something like "501M Removable Media" or "Blank CD-R"
       The former needs special handling for correct translation
    */
    if (media_name.find(TQRegExp("^[0-9]+\\.?[0-9]*[KMGT] (Removable )?Media$")) > -1) {
        TQString pattern = media_name.section(" ", 1);
        media_name.replace(pattern, i18n(pattern.ascii()));
        medium->setLabel(media_name);
    } else {
        medium->setLabel(i18n(media_name.ascii()));
    }

    free(name);

    TQString mimeType;

Lines 34-39 Link Here

(-)./kioslave/media/mediamanager/halbackend.h.ori (+1 lines)
34	#include <tqobject.h>	34	#include <tqobject.h>
35	#include <tqstringlist.h>	35	#include <tqstringlist.h>
36	#include <tqstring.h>	36	#include <tqstring.h>
		37	#include <tqregexp.h>
37		38
38	#include <config.h>	39	#include <config.h>
39		40

Return to bug 1499

Lines 545-551 Link Here

(-)./kioslave/media/mediamanager/halbackend.cpp.ori2 (-1 / +11 lines)
545	char* name = libhal_volume_policy_compute_display_name(halDrive, halVolume, m_halStoragePolicy);	545	char* name = libhal_volume_policy_compute_display_name(halDrive, halVolume, m_halStoragePolicy);
546	TQString volume_name = TQString::fromUtf8(name);	546	TQString volume_name = TQString::fromUtf8(name);
547	TQString media_name = volume_name;	547	TQString media_name = volume_name;
548	medium->setLabel(media_name);	548	/* media_name contains something like "501M Removable Media" or "Blank CD-R"
		549	The former needs special handling for correct translation
		550	*/
		551	if (media_name.find(TQRegExp("^[0-9]+\\.?[0-9]*[KMGT] (Removable )?Media$")) > -1) {
		552	TQString pattern = media_name.section(" ", 1);
		553	media_name.replace(pattern, i18n(pattern.ascii()));
		554	medium->setLabel(media_name);
		555	} else {
		556	medium->setLabel(i18n(media_name.ascii()));
		557	}
		558
549	free(name);	559	free(name);
550		560
551	TQString mimeType;	561	TQString mimeType;