Fix more case-conversion problems in tr_TR (ISO) locale.

Based on the patch by Recai Oktas.
CCBUG:91089

svn path=/trunk/KDE/kdepim/; revision=429639
wilder-work
Bar Metin 21 years ago
parent 0772596ae1
commit f17d97ccd0
  1. 13
      configuredialog.cpp
  2. 24
      kmmsgbase.cpp

@ -74,6 +74,7 @@ using KMime::DateFormatter;
#include <klocale.h>
#include <kapplication.h>
#include <kcharsets.h>
#include <kasciistringtools.h>
#include <kdebug.h>
#include <knuminput.h>
#include <kfontdialog.h>
@ -715,7 +716,7 @@ void AccountsPage::SendingTab::slotTransportSelected()
QListViewItem *cur = mTransportList->selectedItem();
mModifyTransportButton->setEnabled( cur );
mRemoveTransportButton->setEnabled( cur );
mSetDefaultTransportButton->setEnabled( cur );
mSetDefaultTransportButton->setEnabled( cur );
}
// adds a number to @p name to make the name unique
@ -914,7 +915,7 @@ void AccountsPage::SendingTab::slotRemoveSelectedTransport()
}
}
} else {
GlobalSettings::setDefaultTransport( QString::null );
GlobalSettings::setDefaultTransport( QString::null );
}
delete item;
@ -3000,9 +3001,11 @@ void ComposerPage::CharsetTab::doLoadOther() {
QStringList charsets = composer.readListEntry( "pref-charsets" );
for ( QStringList::Iterator it = charsets.begin() ;
it != charsets.end() ; ++it )
if ( (*it) == QString::fromLatin1("locale") )
(*it) = QString("%1 (locale)")
.arg( QCString( kmkernel->networkCodec()->mimeName() ).lower() );
if ( (*it) == QString::fromLatin1("locale") ) {
QCString cset = kmkernel->networkCodec()->mimeName();
KPIM::kAsciiToLower( cset.data() );
(*it) = QString("%1 (locale)").arg( cset );
}
mCharsetListEditor->setStringList( charsets );
mKeepReplyCharsetCheck->setChecked( !composer.readBoolEntry( "force-reply-charset", false ) );

@ -14,6 +14,7 @@ using KMail::MessageProperty;
#include <kdebug.h>
#include <kglobal.h>
#include <kcharsets.h>
#include <kasciistringtools.h>
#include <kmdcodec.h>
#include <krfcdate.h>
@ -570,7 +571,9 @@ QString KMMsgBase::skipKeyword(const QString& aStr, QChar sepChar,
const QTextCodec* KMMsgBase::codecForName(const QCString& _str)
{
if (_str.isEmpty()) return 0;
return KGlobal::charsets()->codecForName(_str.lower());
QCString codec = _str;
KPIM::kAsciiToLower(codec.data());
return KGlobal::charsets()->codecForName(codec);
}
@ -762,8 +765,13 @@ QCString KMMsgBase::encodeRFC2047String(const QString& _str,
if (charset == "us-ascii") return toUsAscii(_str);
QCString cset;
if (charset.isEmpty()) cset = QCString(kmkernel->networkCodec()->mimeName()).lower();
else cset = charset;
if (charset.isEmpty())
{
cset = kmkernel->networkCodec()->mimeName();
KPIM::kAsciiToLower(cset.data());
}
else cset = charset;
const QTextCodec *codec = codecForName(cset);
if (!codec) codec = kmkernel->networkCodec();
@ -849,7 +857,10 @@ QCString KMMsgBase::encodeRFC2231String( const QString& _str,
QCString cset;
if ( charset.isEmpty() )
cset = QCString( kmkernel->networkCodec()->mimeName() ).lower();
{
cset = kmkernel->networkCodec()->mimeName();
KPIM::kAsciiToLower( cset.data() );
}
else
cset = charset;
const QTextCodec *codec = codecForName( cset );
@ -968,7 +979,10 @@ QCString KMMsgBase::autoDetectCharset(const QCString &_encoding, const QStringLi
{
QCString encoding = (*it).latin1();
if (encoding == "locale")
encoding = QCString(kmkernel->networkCodec()->mimeName()).lower();
{
encoding = kmkernel->networkCodec()->mimeName();
KPIM::kAsciiToLower(encoding.data());
}
if (text.isEmpty())
return encoding;
if (encoding == "us-ascii") {

Loading…
Cancel
Save