Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-24 02:42:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kdecore: drop redundant "emphasis" markup tag

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2023-08-19 23:20:09 +03:00
parent f8e1de3728
commit f56c50e41a
4 changed files with 6 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
kdecore/localization/klocalizedstring.h
View file

@ -245,7 +245,6 @@ class KLocalizedStringPrivate;
* the process depending on wheather the message is rich text or not. Currently, the following HTML * the process depending on wheather the message is rich text or not. Currently, the following HTML
* tags are recognized in the message: * tags are recognized in the message:
* \li filename * \li filename
* \li emphasis
* \li email * \li email
* \li title * \li title
* \li warning * \li warning

4
kdecore/localization/kuitsemantics.cpp
View file

@ -34,10 +34,6 @@ KuitSemantics::KuitSemantics(const QString &lang)
format.plain = m_catalog.translate("@filename/plain", "‘%1’"); format.plain = m_catalog.translate("@filename/plain", "‘%1’");
format.rich = m_catalog.translate("@filename/rich", "<tt>%1</tt>"); format.rich = m_catalog.translate("@filename/rich", "<tt>%1</tt>");
m_formats.append(format); m_formats.append(format);
format.tag = QString::fromLatin1("emphasis");
format.plain = m_catalog.translate("@emphasis/plain", "*%1*");
format.rich = m_catalog.translate("@emphasis/rich", "<i>%1</i>");
m_formats.append(format);
format.tag = QString::fromLatin1("email"); format.tag = QString::fromLatin1("email");
format.plain = m_catalog.translate("@email/plain", "&lt;%1&gt;"); format.plain = m_catalog.translate("@email/plain", "&lt;%1&gt;");
format.rich = m_catalog.translate("@email/rich", "&lt;<a href=\"mailto:%1\">%1</a>&gt;"); format.rich = m_catalog.translate("@email/rich", "&lt;<a href=\"mailto:%1\">%1</a>&gt;");

34
kdecore/tests/klocalizedstringtest.cpp
View file

@ -146,31 +146,27 @@ void KLocalizedStringTest::correctSubs ()
QString("<html>E &lt; mc^2</html>") QString("<html>E &lt; mc^2</html>")
); );
QCOMPARE( QCOMPARE(
i18n("E ? <emphasis>mc^2</emphasis>"), i18n("E &lt; <i>mc^2</i>"),
QString("E ? *mc^2*")
);
QCOMPARE(
i18n("E &lt; <emphasis>mc^2</emphasis>"),
QString("E &lt; <i>mc^2</i>") QString("E &lt; <i>mc^2</i>")
); );
QCOMPARE( QCOMPARE(
i18n("<html>E &lt; <emphasis>mc^2</emphasis></html>"), i18n("<html>E &lt; <i>mc^2</i></html>"),
QString("<html>E &lt; <i>mc^2</i></html>") QString("<html>E &lt; <i>mc^2</i></html>")
); );
QCOMPARE( QCOMPARE(
i18n("<b>E</b> &lt; <emphasis>mc^2</emphasis>"), i18n("<b>E</b> &lt; <i>mc^2</i>"),
QString("<b>E</b> &lt; <i>mc^2</i>") QString("<b>E</b> &lt; <i>mc^2</i>")
); );
QCOMPARE( QCOMPARE(
i18n("<emphasis>E</emphasis> &lt; <b>mc^2</b>"), i18n("<i>E</i> &lt; <b>mc^2</b>"),
QString("<i>E</i> &lt; <b>mc^2</b>") QString("<i>E</i> &lt; <b>mc^2</b>")
); );
QCOMPARE( QCOMPARE(
i18nc("@label", "E &lt; <emphasis>mc^2</emphasis>"), i18nc("@label", "E &lt; <i>mc^2</i>"),
QString("E &lt; <i>mc^2</i>") QString("E &lt; <i>mc^2</i>")
); );
QCOMPARE( QCOMPARE(
i18nc("@info", "E &lt; <emphasis>mc^2</emphasis>"), i18nc("@info", "E &lt; <i>mc^2</i>"),
QString("E &lt; <i>mc^2</i>") QString("E &lt; <i>mc^2</i>")
); );
QCOMPARE(i18n("E = mc^&#x0032;"), QString("E = mc^&#x0032;")); QCOMPARE(i18n("E = mc^&#x0032;"), QString("E = mc^&#x0032;"));
@ -187,24 +183,6 @@ void KLocalizedStringTest::correctSubs ()
} }
} }
void KLocalizedStringTest::correctButIllFormed()
{
// ...and some ill-formed i18n, to test markup salvage.
// (prevent debug info about bad markup).
KConfig dc("kdebugrc", KConfig::SimpleConfig );
dc.group(QString::number(173)).writeEntry("InfoOutput", 4);
dc.sync();
QCOMPARE(i18n("E < %1 * mc^2", 10), QString("E < 10 * mc^2"));
QCOMPARE(
i18n("<emphasis>%1</emphasis> &lt; mc^2", QString("<E>")),
QString("*<E>* &lt; mc^2")
);
QCOMPARE(
i18n("<emphasis>%1</emphasis> &lt; <b>mc^2</b>", QString("<E>")),
QString("<i><E></i> &lt; <b>mc^2</b>")
);
}
void KLocalizedStringTest::wrongSubs() void KLocalizedStringTest::wrongSubs()
{ {
#ifndef NDEBUG #ifndef NDEBUG

1
kdecore/tests/klocalizedstringtest.h
View file

@ -27,7 +27,6 @@ class KLocalizedStringTest : public QObject
private Q_SLOTS: private Q_SLOTS:
void initTestCase(); void initTestCase();
void correctSubs(); void correctSubs();
void correctButIllFormed();
void wrongSubs(); void wrongSubs();
void miscMethods(); void miscMethods();
void translateToFrench(); void translateToFrench();