[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kholidays] /: KF5: Convert from Ki18n to Qt tranlate
From: John Layt <jlayt () kde ! org>
Date: 2015-09-02 18:07:29
Message-ID: E1ZXCRV-0003LI-99 () scm ! kde ! org
[Download RAW message or body]
Git commit db603c49c631930afbd56bedc105b4424f06733f by John Layt.
Committed on 02/09/2015 at 17:53.
Pushed by jlayt into branch 'master'.
KF5: Convert from Ki18n to Qt tranlate
Convert from KDE to QT translation tools with intention to become a
Tier 1 framework.
M +0 -2 CMakeLists.txt
M +0 -1 autotests/testholidayregion.cpp
M +0 -1 autotests/testlunar.cpp
M +0 -1 autotests/testseasons.cpp
M +0 -3 src/CMakeLists.txt
M +5 -6 src/astroseasons.cpp
M +46 -47 src/holidayregion.cpp
M +30 -25 src/holidayregionselector.cpp
M +5 -6 src/lunarphase.cpp
M +25 -26 src/zodiac.cpp
http://commits.kde.org/kholidays/db603c49c631930afbd56bedc105b4424f06733f
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ee628a1..38a9d77 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,7 +30,6 @@ ecm_setup_version(${KHOLIDAYS_LIB_VERSION} VARIABLE_PREFIX \
KHOLIDAYS find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Widgets Test)
find_package(KF5ItemViews ${KF5_VERSION} CONFIG REQUIRED)
find_package(KF5Completion ${KF5_VERSION} CONFIG REQUIRED)
-find_package(KF5I18n ${KF5_VERSION} CONFIG REQUIRED)
find_package(KF5DesignerPlugin ${KF5_VERSION} CONFIG REQUIRED)
find_package(Qt5Designer NO_MODULE)
@@ -38,7 +37,6 @@ set_package_properties(Qt5Designer PROPERTIES
PURPOSE "Required to build the Qt Designer plugins"
TYPE OPTIONAL
)
-add_definitions(-DTRANSLATION_DOMAIN=\"libkholidays5\")
remove_definitions(-DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII)
########### Targets ###########
diff --git a/autotests/testholidayregion.cpp b/autotests/testholidayregion.cpp
index 1401b38..e4c491c 100644
--- a/autotests/testholidayregion.cpp
+++ b/autotests/testholidayregion.cpp
@@ -25,7 +25,6 @@
#include <QFile>
#include <QFileInfo>
#include <qtest.h>
-#include <KLocalizedString>
#include <QDebug>
QTEST_MAIN( HolidayRegionTest )
diff --git a/autotests/testlunar.cpp b/autotests/testlunar.cpp
index 1ba0524..78f62a1 100644
--- a/autotests/testlunar.cpp
+++ b/autotests/testlunar.cpp
@@ -21,7 +21,6 @@
#include "testlunar.h"
#include <qtest.h>
-#include <klocalizedstring.h>
#include <qdebug.h>
QTEST_MAIN( LunarTest )
diff --git a/autotests/testseasons.cpp b/autotests/testseasons.cpp
index 5f312c6..0ac169c 100644
--- a/autotests/testseasons.cpp
+++ b/autotests/testseasons.cpp
@@ -21,7 +21,6 @@
#include "testseasons.h"
#include <qtest.h>
-#include <klocalizedstring.h>
QTEST_MAIN( SeasonsTest )
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a26e4fe..e147fb8 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -25,8 +25,6 @@ set(kholidays_UI
holidayregionselector.ui
)
-ki18n_wrap_ui(kholidays_SRCS ${kholidays_UI})
-
add_library(KF5Holidays ${kholidays_SRCS})
generate_export_header(KF5Holidays BASE_NAME kholidays)
@@ -40,7 +38,6 @@ target_link_libraries(KF5Holidays
PUBLIC
Qt5::Widgets
Qt5::Test
- KF5::I18n
KF5::ItemViews
KF5::Completion
)
diff --git a/src/astroseasons.cpp b/src/astroseasons.cpp
index 298a164..667d1c0 100644
--- a/src/astroseasons.cpp
+++ b/src/astroseasons.cpp
@@ -21,9 +21,8 @@
#include "astroseasons.h"
-#include <KLocalizedString>
-
#include <QtCore/QDate>
+#include <QtCore/QCoreApplication>
using namespace KHolidays;
@@ -36,13 +35,13 @@ QString AstroSeasons::seasonName( AstroSeasons::Season season )
{
switch ( season ) {
case JuneSolstice:
- return i18n( "June Solstice" );
+ return QCoreApplication::translate( "AstroSeasons", "June Solstice" );
case DecemberSolstice:
- return i18n( "December Solstice" );
+ return QCoreApplication::translate( "AstroSeasons", "December Solstice" );
case MarchEquinox:
- return i18n( "March Equinox" );
+ return QCoreApplication::translate( "AstroSeasons", "March Equinox" );
case SeptemberEquinox:
- return i18n( "September Equinox" );
+ return QCoreApplication::translate( "AstroSeasons", "September Equinox" );
default:
case None:
return QString();
diff --git a/src/holidayregion.cpp b/src/holidayregion.cpp
index b03591d..b860f5b 100644
--- a/src/holidayregion.cpp
+++ b/src/holidayregion.cpp
@@ -30,8 +30,7 @@
#include <QtCore/QFileInfo>
#include <QtCore/QSharedData>
#include <QtCore/QStandardPaths>
-
-#include <KLocalizedString>
+#include <QtCore/QCoreApplication>
#include "holiday_p.h"
#include "parsers/plan2/holidayparserdriverplan_p.h"
@@ -182,41 +181,41 @@ QString HolidayRegion::name() const
// In 4.6 hope to have isocodes project integration for translations via \
KLocale QString subdivision = countryParts.at( 1 );
if ( country == QLatin1String("ca") && subdivision == QLatin1String("qc") ) \
{
- regionName = i18nc( "Canadian region", "Quebec" );
+ regionName = QCoreApplication::translate( "HolidayRegion", "Quebec", \
"Canadian region" );
} else if ( country == QLatin1String("de") && subdivision == \
QLatin1String("by") ) {
- regionName = i18nc( "German region", "Bavaria" );
+ regionName = QCoreApplication::translate( "HolidayRegion", "Bavaria", \
"German region" );
} else if ( country == QLatin1String("es") && subdivision == \
QLatin1String("ct") ) {
- regionName = i18nc( "Spanish region", "Catalonia" );
+ regionName = QCoreApplication::translate( "HolidayRegion", "Catalonia", \
"Spanish region" );
} else if ( country == QLatin1String("gb") && subdivision == \
QLatin1String("eaw") ) {
- regionName = i18nc( "UK Region", "England and Wales" );
+ regionName = QCoreApplication::translate( "HolidayRegion", "England and \
Wales", "UK Region" );
} else if ( country == QLatin1String("gb") && subdivision == \
QLatin1String("eng") ) {
- regionName = i18nc( "UK Region", "England" );
+ regionName = QCoreApplication::translate( "HolidayRegion", "England", "UK \
Region" );
} else if ( country == QLatin1String("gb") && subdivision == \
QLatin1String("wls") ) {
- regionName = i18nc( "UK Region", "Wales" );
+ regionName = QCoreApplication::translate( "HolidayRegion", "Wales", "UK \
Region" );
} else if ( country == QLatin1String("gb") && subdivision == \
QLatin1String("sct") ) {
- regionName = i18nc( "UK Region", "Scotland" );
+ regionName = QCoreApplication::translate( "HolidayRegion", "Scotland", \
"UK Region" );
} else if ( country == QLatin1String("gb") && subdivision == \
QLatin1String("nir") ) {
- regionName = i18nc( "UK Region", "Northern Ireland" );
+ regionName = QCoreApplication::translate( "HolidayRegion", "Northern \
Ireland", "UK Region" );
} else if ( country == QLatin1String("it") && subdivision == \
QLatin1String("bz") ) {
- regionName = i18nc( "Italian Region", "South Tyrol" );
+ regionName = QCoreApplication::translate( "HolidayRegion", "South Tyrol", \
"Italian Region" );
} else if ( country == QLatin1String("au") && subdivision == \
QLatin1String("nsw") ) {
- regionName = i18nc( "Australian Region", "New South Wales" );
+ regionName = QCoreApplication::translate( "HolidayRegion", "New South \
Wales" );
} else if ( country == QLatin1String("au") && subdivision == \
QLatin1String("qld") ) {
- regionName = i18nc( "Australian Region", "Queensland" );
+ regionName = QCoreApplication::translate( "HolidayRegion", "Queensland", \
"Australian Region" );
} else if ( country == QLatin1String("au") && subdivision == \
QLatin1String("vic") ) {
- regionName = i18nc( "Australian Region", "Victoria" );
+ regionName = QCoreApplication::translate( "HolidayRegion", "Victoria", \
"Australian Region" );
} else if ( country == QLatin1String("au") && subdivision == \
QLatin1String("sa") ) {
- regionName = i18nc( "Australian Region", "South Australia" );
+ regionName = QCoreApplication::translate( "HolidayRegion", "South \
Australia", "Australian Region" );
} else if ( country == QLatin1String("au") && subdivision == \
QLatin1String("nt") ) {
- regionName = i18nc( "Australian Region", "Northern Territory" );
+ regionName = QCoreApplication::translate( "HolidayRegion", "Northern \
Territory", "Australian Region" );
} else if ( country == QLatin1String("au") && subdivision == \
QLatin1String("act") ) {
- regionName = i18nc( "Australian Region", "Australian Capital Territory" );
+ regionName = QCoreApplication::translate( "HolidayRegion", "Australian \
Capital Territory", "Australian Region" );
} else if ( country == QLatin1String("au") && subdivision == \
QLatin1String("wa") ) {
- regionName = i18nc( "Australian Region", "Western Australia" );
+ regionName = QCoreApplication::translate( "HolidayRegion", "Western \
Australia", "Australian Region" );
} else if ( country == QLatin1String("au") && subdivision == \
QLatin1String("tas") ) {
- regionName = i18nc( "Australian Region", "Tasmania" );
+ regionName = QCoreApplication::translate( "HolidayRegion", "Tasmania", \
"Australian Region" );
} else if ( country == QLatin1String("ba") && subdivision == \
QLatin1String("srp") ) {
- regionName = i18nc( "Bosnian and Herzegovinian Region", "Republic of \
Srpska" ); + regionName = QCoreApplication::translate( "HolidayRegion", \
"Republic of Srpska", "Bosnian and Herzegovinian Region" ); } else {
// TODO Note this does not give the current QLocale translation!
regionName = QLocale::countryToString( codeToCountry( country ) );
@@ -234,68 +233,68 @@ QString HolidayRegion::name() const
// Will create lots more in 4.6
// Religious types, just simple for now
if ( type == QLatin1String("public") ) {
- typeName = i18nc( "Holiday type", "Public" );
+ typeName = QCoreApplication::translate( "HolidayRegion", "Public", "Holiday \
type" ); } else if ( type == QLatin1String("civil") ) {
- typeName = i18nc( "Holiday type", "Civil" );
+ typeName = QCoreApplication::translate( "HolidayRegion", "Civil", "Holiday \
type" ); } else if ( type == QLatin1String("religious") ) {
- typeName = i18nc( "Holiday type", "Religious" );
+ typeName = QCoreApplication::translate( "HolidayRegion", "Religious", \
"Holiday type" ); } else if ( type == QLatin1String("government") ) {
- typeName = i18nc( "Holiday type", "Government" );
+ typeName = QCoreApplication::translate( "HolidayRegion", "Government", \
"Holiday type" ); } else if ( type == QLatin1String("financial") ) {
- typeName = i18nc( "Holiday type", "Financial" );
+ typeName = QCoreApplication::translate( "HolidayRegion", "Financial", \
"Holiday type" ); } else if ( type == QLatin1String("cultural") ) {
- typeName = i18nc( "Holiday type", "Cultural" );
+ typeName = QCoreApplication::translate( "HolidayRegion", "Cultural", \
"Holiday type" ); } else if ( type == QLatin1String("commemorative") ) {
- typeName = i18nc( "Holiday type", "Commemorative" );
+ typeName = QCoreApplication::translate( "HolidayRegion", "Commemorative", \
"Holiday type" ); } else if ( type == QLatin1String("historical") ) {
- typeName = i18nc( "Holiday type", "Historical" );
+ typeName = QCoreApplication::translate( "HolidayRegion", "Historical", \
"Holiday type" ); } else if ( type == QLatin1String("school") ) {
- typeName = i18nc( "Holiday type", "School" );
+ typeName = QCoreApplication::translate( "HolidayRegion", "School", "Holiday \
type" ); } else if ( type == QLatin1String("seasonal") ) {
- typeName = i18nc( "Holiday type", "Seasonal" );
+ typeName = QCoreApplication::translate( "HolidayRegion", "Seasonal", \
"Holiday type" ); } else if ( type == QLatin1String("nameday") ) {
- typeName = i18nc( "Holiday type", "Name Days" );
+ typeName = QCoreApplication::translate( "HolidayRegion", "Name Days", \
"Holiday type" ); } else if ( type == QLatin1String("personal") ) {
- typeName = i18nc( "Holiday type", "Personal" );
+ typeName = QCoreApplication::translate( "HolidayRegion", "Personal", \
"Holiday type" ); } else if ( type == QLatin1String("christian") ) {
- typeName = i18nc( "Holiday type", "Christian" );
+ typeName = QCoreApplication::translate( "HolidayRegion", "Christian", \
"Holiday type" ); } else if ( type == QLatin1String("anglican") ) {
- typeName = i18nc( "Holiday type", "Anglican" );
+ typeName = QCoreApplication::translate( "HolidayRegion", "Anglican", \
"Holiday type" ); } else if ( type == QLatin1String("catholic") ) {
- typeName = i18nc( "Holiday type", "Catholic" );
+ typeName = QCoreApplication::translate( "HolidayRegion", "Catholic", \
"Holiday type" ); } else if ( type == QLatin1String("protestant") ) {
- typeName = i18nc( "Holiday type", "Protestant" );
+ typeName = QCoreApplication::translate( "HolidayRegion", "Protestant", \
"Holiday type" ); } else if ( type == QLatin1String("orthodox") ) {
- typeName = i18nc( "Holiday type", "Orthodox" );
+ typeName = QCoreApplication::translate( "HolidayRegion", "Orthodox", \
"Holiday type" ); } else if ( type == QLatin1String("jewish") ) {
- typeName = i18nc( "Holiday type", "Jewish" );
+ typeName = QCoreApplication::translate( "HolidayRegion", "Jewish", "Holiday \
type" ); } else if ( type == QLatin1String("jewish-orthodox") ) {
- typeName = i18nc( "Holiday type", "Jewish Orthodox" );
+ typeName = QCoreApplication::translate( "HolidayRegion", "Jewish Orthodox", \
"Holiday type" ); } else if ( type == QLatin1String("jewish-conservative") ) {
- typeName = i18nc( "Holiday type", "Jewish Conservative" );
+ typeName = QCoreApplication::translate( "HolidayRegion", "Jewish \
Conservative", "Holiday type" ); } else if ( type == QLatin1String("jewish-reform") \
) {
- typeName = i18nc( "Holiday type", "Jewish Reform" );
+ typeName = QCoreApplication::translate( "HolidayRegion", "Jewish Reform", \
"Holiday type" ); } else if ( type == QLatin1String("islamic") ) {
- typeName = i18nc( "Holiday type", "Islamic" );
+ typeName = QCoreApplication::translate( "HolidayRegion", "Islamic", \
"Holiday type" ); } else if ( type == QLatin1String("islamic-sunni") ) {
- typeName = i18nc( "Holiday type", "Islamic Sunni" );
+ typeName = QCoreApplication::translate( "HolidayRegion", "Islamic Sunni", \
"Holiday type" ); } else if ( type == QLatin1String("islamic-shia") ) {
- typeName = i18nc( "Holiday type", "Islamic Shia" );
+ typeName = QCoreApplication::translate( "HolidayRegion", "Islamic Shia", \
"Holiday type" ); } else if ( type == QLatin1String("islamic-sufi") ) {
- typeName = i18nc( "Holiday type", "Islamic Sufi" );
+ typeName = QCoreApplication::translate( "HolidayRegion", "Islamic Sufi", \
"Holiday type" ); }
}
if ( !regionName.isEmpty() ) {
if ( !typeName.isEmpty() ) {
- tempName = i18nc( "Holiday file display name, %1 = region name, %2 = holiday \
type", "%1 - %2" ).arg( regionName ).arg( typeName ); + tempName = \
QCoreApplication::translate( "HolidayRegion", "%1 - %2", "Holiday file display name, \
%1 = region name, %2 = holiday type" ).arg( regionName ).arg( typeName ); } else {
tempName = regionName;
}
} else if ( !typeName.isEmpty() ) {
tempName = typeName;
} else {
- tempName = i18nc( "Unknown holiday region", "Unknown" );
+ tempName = QCoreApplication::translate( "HolidayRegion", "Unknown", "Unknown \
holiday region" ); }
}
return tempName;
diff --git a/src/holidayregionselector.cpp b/src/holidayregionselector.cpp
index 74e8ba3..011d4b8 100644
--- a/src/holidayregionselector.cpp
+++ b/src/holidayregionselector.cpp
@@ -25,7 +25,8 @@
#include "holidayregion.h"
#include "holiday_p.h"
-#include <KLocalizedString>
+#include <QtCore/QCoreApplication>
+
#include <KComboBox>
using namespace KHolidays;
@@ -102,17 +103,20 @@ void HolidayRegionSelector::Private::initItem( QTreeWidgetItem \
*listItem, Holida m_ui.regionTreeWidget->blockSignals( true );
QString languageName = QLocale::languageToString( codeToLanguage( \
region->languageCode() ) ); listItem->setCheckState( Private::SelectColumn, \
Qt::Unchecked );
- QString text = i18n( "<p>Select to use Holiday Region</p>" );
+ QString text = QCoreApplication::translate( "HolidayRegionSelector", "<p>Select to \
use Holiday Region</p>" ); listItem->setToolTip( Private::SelectColumn, text );
listItem->setToolTip( Private::ComboColumn, text );
- text = i18n( "<p>Select to use Holiday Region</p>" );
+ text = QCoreApplication::translate( "HolidayRegionSelector", "<p>Select to use \
Holiday Region</p>" ); listItem->setToolTip( Private::SelectColumn, text );
listItem->setToolTip( Private::ComboColumn, text );
listItem->setText( Private::RegionColumn, region->name() );
- QString toolTip = i18n( "<p><b>Region:</b> %1<br/>"
- "<b>Language:</b> %2<br/>"
- "<b>Description:</b> %3</p>",
- region->name(), languageName, region->description() );
+ QString toolTip = QCoreApplication::translate( "HolidayRegionSelector",
+ "<p><b>Region:</b> %1<br/>"
+ "<b>Language:</b> %2<br/>"
+ "<b>Description:</b> %3</p>")
+ .arg( region->name() )
+ .arg( languageName )
+ .arg( region->description() );
listItem->setToolTip( Private::RegionColumn, toolTip );
listItem->setData( Private::RegionColumn, Qt::UserRole, region->regionCode() );
listItem->setText( Private::LanguageColumn, languageName );
@@ -121,19 +125,20 @@ void HolidayRegionSelector::Private::initItem( QTreeWidgetItem \
*listItem, Holida listItem->setToolTip( Private::DescriptionColumn, \
region->description() ); KComboBox *combo = new KComboBox();
combo->setAutoFillBackground( true );
- QString comboText = i18n( "<p>You can choose to display the Holiday Region for \
information only, "
- "or to use the Holiday Region when displaying or \
calculating days off "
- "such as Public Holidays. If you choose to use the \
Holiday Region for "
- "Days Off, then only those Holiday Events marked in the \
Holiday Region "
- "as Days Off will be used for non-work days, Holiday \
Events that are "
- "not marked in the Holiday Region as Days Off will \
continue to be "
- "work days.</p>" );
+ QString comboText = QCoreApplication::translate( "HolidayRegionSelector",
+ "<p>You can choose to display the \
Holiday Region for information only, " + \
"or to use the Holiday Region when displaying or calculating days off " + \
"such as Public Holidays. If you choose to use the Holiday Region for " + \
"Days Off, then only those Holiday Events marked in the Holiday Region " + \
"as Days Off will be used for non-work days, Holiday Events that are " + \
"not marked in the Holiday Region as Days Off will continue to be " + \
"work days.</p>" ); combo->setToolTip( comboText );
- comboText = i18nc( "Combobox label, Holiday Region not used", "Not Used" );
+ comboText = QCoreApplication::translate( "HolidayRegionSelectorasons", "Not Used", \
"Combobox label, Holiday Region not used" ); combo->addItem( comboText, QVariant( \
NotUsed ) );
- comboText = i18nc( "Combobox label, use Holiday Region for information only", \
"Information" ); + comboText = QCoreApplication::translate( \
"HolidayRegionSelectorasons", "Information", "Combobox label, use Holiday Region for \
information only" ); combo->addItem( comboText, QVariant( UseInformationOnly ) );
- comboText = i18nc( "Combobox label, use Holiday Region for days off", "Days Off" \
); + comboText = QCoreApplication::translate( "HolidayRegionSelectorasons", "Days \
Off", "Combobox label, use Holiday Region for days off" ); combo->addItem( \
comboText, QVariant( UseDaysOff ) ); combo->setCurrentIndex( 0 );
listItem->setData( Private::ComboColumn, Qt::UserRole, NotUsed );
@@ -237,26 +242,26 @@ HolidayRegionSelector::HolidayRegionSelector( QWidget *parent ) \
: // Setup the columns
d->m_ui.regionTreeWidget->setColumnCount( 5 );
QTreeWidgetItem *headerItem = d->m_ui.regionTreeWidget->headerItem();
- QString header = i18nc( "Header for Select column", "Select" );
- QString text = i18n( "<p>This column selects to use the Holiday Region</p>" );
+ QString header = QCoreApplication::translate( "HolidayRegionSelectorasons", \
"Select", "Header for Select column" ); + QString text = \
QCoreApplication::translate( "HolidayRegionSelector", "<p>This column selects to use \
the Holiday Region</p>" ); headerItem->setText( Private::SelectColumn, header );
headerItem->setToolTip( Private::SelectColumn, text );
headerItem->setWhatsThis( Private::SelectColumn, text );
headerItem->setText( Private::ComboColumn, header );
headerItem->setToolTip( Private::ComboColumn, text );
headerItem->setWhatsThis( Private::ComboColumn, text );
- header = i18nc( "Header for Holiday Region column", "Region" );
- text = i18n( "<p>This column displays the name of the Holiday Region</p>" );
+ header = QCoreApplication::translate( "HolidayRegionSelectorasons", "Region", \
"Header for Holiday Region column" ); + text = QCoreApplication::translate( \
"HolidayRegionSelector", "<p>This column displays the name of the Holiday Region</p>" \
); headerItem->setText( Private::RegionColumn, header );
headerItem->setToolTip( Private::RegionColumn, text );
headerItem->setWhatsThis( Private::RegionColumn, text );
- header = i18nc( "Header for Language column", "Language" );
- text = i18n( "<p>This column displays the language of the Holiday Region</p>" );
+ header = QCoreApplication::translate( "HolidayRegionSelectorasons", "Language", \
"Header for Language column" ); + text = QCoreApplication::translate( \
"HolidayRegionSelector", "<p>This column displays the language of the Holiday \
Region</p>" ); headerItem->setText( Private::LanguageColumn, header );
headerItem->setToolTip( Private::LanguageColumn, text );
headerItem->setWhatsThis( Private::LanguageColumn, text );
- header = i18nc( "Header for Description column", "Description" );
- text = i18n( "<p>This column displays the description of the Holiday Region</p>" \
); + header = QCoreApplication::translate( "HolidayRegionSelectorasons", \
"Description", "Header for Description column" ); + text = \
QCoreApplication::translate( "HolidayRegionSelector", "<p>This column displays the \
description of the Holiday Region</p>" ); headerItem->setText( \
Private::DescriptionColumn, header ); headerItem->setToolTip( \
Private::DescriptionColumn, text ); headerItem->setWhatsThis( \
Private::DescriptionColumn, text );
diff --git a/src/lunarphase.cpp b/src/lunarphase.cpp
index e616a18..1b3e15b 100644
--- a/src/lunarphase.cpp
+++ b/src/lunarphase.cpp
@@ -25,9 +25,8 @@
#include "lunarphase.h"
#include <config-kholidays.h>
-#include <KLocalizedString>
-
#include <QtCore/QDateTime>
+#include <QtCore/QCoreApplication>
using namespace KHolidays;
@@ -44,13 +43,13 @@ QString LunarPhase::phaseName( LunarPhase::Phase phase )
{
switch ( phase ) {
case NewMoon:
- return( i18n( "New Moon" ) );
+ return( QCoreApplication::translate( "LunarPhase", "New Moon" ) );
case FullMoon:
- return( i18n( "Full Moon" ) );
+ return( QCoreApplication::translate( "LunarPhase", "Full Moon" ) );
case FirstQuarter:
- return( i18n( "First Quarter Moon" ) );
+ return( QCoreApplication::translate( "LunarPhase", "First Quarter Moon" ) );
case LastQuarter:
- return( i18n( "Last Quarter Moon" ) );
+ return( QCoreApplication::translate( "LunarPhase", "Last Quarter Moon" ) );
default:
case None:
return QString();
diff --git a/src/zodiac.cpp b/src/zodiac.cpp
index fd7f704..db55e14 100644
--- a/src/zodiac.cpp
+++ b/src/zodiac.cpp
@@ -21,10 +21,9 @@
#include "zodiac.h"
-#include <KLocalizedString>
-
#include <QtCore/QDateTime>
#include <QtCore/QSharedData>
+#include <QtCore/QCoreApplication>
using namespace KHolidays;
@@ -77,29 +76,29 @@ QString Zodiac::signName( Zodiac::ZodiacSigns sign )
{
switch ( sign ) {
case Aries:
- return i18n( "Aries" );
+ return QCoreApplication::translate( "Zodiac", "Aries" );
case Taurus:
- return i18n( "Taurus" );
+ return QCoreApplication::translate( "Zodiac", "Taurus" );
case Gemini:
- return i18n( "Gemini" );
+ return QCoreApplication::translate( "Zodiac", "Gemini" );
case Cancer:
- return i18n( "Cancer" );
+ return QCoreApplication::translate( "Zodiac", "Cancer" );
case Leo:
- return i18n( "Leo" );
+ return QCoreApplication::translate( "Zodiac", "Leo" );
case Virgo:
- return i18n( "Virgo" );
+ return QCoreApplication::translate( "Zodiac", "Virgo" );
case Libra:
- return i18n( "Libra" );
+ return QCoreApplication::translate( "Zodiac", "Libra" );
case Scorpio:
- return i18n( "Scorpio" );
+ return QCoreApplication::translate( "Zodiac", "Scorpio" );
case Sagittarius:
- return i18n( "Sagittarius" );
+ return QCoreApplication::translate( "Zodiac", "Sagittarius" );
case Capricorn:
- return i18n( "Capricorn" );
+ return QCoreApplication::translate( "Zodiac", "Capricorn" );
case Aquarius:
- return i18n( "Aquarius" );
+ return QCoreApplication::translate( "Zodiac", "Aquarius" );
case Pisces:
- return i18n( "Pisces" );
+ return QCoreApplication::translate( "Zodiac", "Pisces" );
default:
case None:
return QString();
@@ -270,29 +269,29 @@ QString Zodiac::signSymbol( Zodiac::ZodiacSigns sign )
{
switch ( sign ) {
case Aries:
- return i18nc( "zodiac symbol for Aries", "ram" );
+ return QCoreApplication::translate( "HolidayRegion", "ram", "zodiac symbol for \
Aries" ); case Taurus:
- return i18nc( "zodiac symbol for Taurus", "bull" );
+ return QCoreApplication::translate( "HolidayRegion", "bull", "zodiac symbol for \
Taurus" ); case Gemini:
- return i18nc( "zodiac symbol for Gemini", "twins" );
+ return QCoreApplication::translate( "HolidayRegion", "twins", "zodiac symbol for \
Gemini" ); case Cancer:
- return i18nc( "zodiac symbol for Cancer", "crab" );
+ return QCoreApplication::translate( "HolidayRegion", "crab", "zodiac symbol for \
Cancer" ); case Leo:
- return i18nc( "zodiac symbol for Leo", "lion" );
+ return QCoreApplication::translate( "HolidayRegion", "lion", "zodiac symbol for \
Leo" ); case Virgo:
- return i18nc( "zodiac symbol for Virgo", "virgin" );
+ return QCoreApplication::translate( "HolidayRegion", "virgin", "zodiac symbol \
for Virgo" ); case Libra:
- return i18nc( "zodiac symbol for Libra", "scales" );
+ return QCoreApplication::translate( "HolidayRegion", "scales", "zodiac symbol \
for Libra" ); case Scorpio:
- return i18nc( "zodiac symbol for Scorpion", "scorpion" );
+ return QCoreApplication::translate( "HolidayRegion", "scorpion", "zodiac symbol \
for Scorpion" ); case Sagittarius:
- return i18nc( "zodiac symbol for Sagittarius", "archer" );
+ return QCoreApplication::translate( "HolidayRegion", "archer", "zodiac symbol \
for Sagittarius" ); case Capricorn:
- return i18nc( "zodiac symbol for Capricorn", "goat" );
+ return QCoreApplication::translate( "HolidayRegion", "goat", "zodiac symbol for \
Capricorn" ); case Aquarius:
- return i18nc( "zodiac symbol for Aquarius", "water carrier" );
+ return QCoreApplication::translate( "HolidayRegion", "water carrier", "zodiac \
symbol for Aquarius" ); case Pisces:
- return i18nc( "zodiac symbol for Pices", "fish" );
+ return QCoreApplication::translate( "HolidayRegion", "fish", "zodiac symbol for \
Pices" ); default:
case None:
return QString();
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic