diff --git a/src/ksanewidget.cpp b/src/ksanewidget.cpp --- a/src/ksanewidget.cpp +++ b/src/ksanewidget.cpp @@ -70,20 +70,6 @@ SANE_Int version; SANE_Status status; - //qDebug() << "The language is:" << KGlobal::locale()->language(); - //qDebug() << "Languagelist" << KGlobal::locale()->languageList(); - - /* - see http://community.kde.org/Frameworks/Porting_Notes#KDECore_Changes: - For translation support, use KLocalizedString (ki18n framework). Translation catalogs are no longer dynamically inserted, - so the idiom KGlobal::locale()->insertCatalog("somecatalog") is no longer available. - To simply make the code build, for the sake of porting other things first, just remove or comment out these calls. - This will stop translations from working, and to fully port them eventually, follow the section - "Connecting Calls to Catalogs" in ki18n programmer's guide. - */ - //KGlobal::locale()->insertCatalog("libksane"); // FIXME KF5 - //KGlobal::locale()->insertCatalog("sane-backends"); // FIXME KF5 - s_objectMutex.lock(); s_objectCount++; diff --git a/src/options/ksaneoptbutton.cpp b/src/options/ksaneoptbutton.cpp --- a/src/options/ksaneoptbutton.cpp +++ b/src/options/ksaneoptbutton.cpp @@ -54,8 +54,8 @@ return; } - m_widget = m_button = new KSaneButton(parent, i18n(m_optDesc->title)); - m_widget->setToolTip(i18n(m_optDesc->desc)); + m_widget = m_button = new KSaneButton(parent, sane_i18n(m_optDesc->title)); + m_widget->setToolTip(sane_i18n(m_optDesc->desc)); connect(m_button, &KSaneButton::clicked, this, &KSaneOptButton::buttonClicked); updateVisibility(); diff --git a/src/options/ksaneoptcheckbox.cpp b/src/options/ksaneoptcheckbox.cpp --- a/src/options/ksaneoptcheckbox.cpp +++ b/src/options/ksaneoptcheckbox.cpp @@ -56,8 +56,8 @@ return; } - m_widget = m_checkbox = new LabeledCheckbox(parent, i18n(m_optDesc->title)); - m_widget->setToolTip(i18n(m_optDesc->desc)); + m_widget = m_checkbox = new LabeledCheckbox(parent, sane_i18n(m_optDesc->title)); + m_widget->setToolTip(sane_i18n(m_optDesc->desc)); connect(m_checkbox, &LabeledCheckbox::toggled, this, &KSaneOptCheckBox::checkboxChanged); @@ -94,7 +94,7 @@ m_checkbox->setChecked(m_checked); } if ((old != m_checked) && ((m_optDesc->cap & SANE_CAP_SOFT_SELECT) == 0)) { - emit buttonPressed(name(), i18n(m_optDesc->title), m_checked); + emit buttonPressed(name(), sane_i18n(m_optDesc->title), m_checked); } } diff --git a/src/options/ksaneoptcombo.cpp b/src/options/ksaneoptcombo.cpp --- a/src/options/ksaneoptcombo.cpp +++ b/src/options/ksaneoptcombo.cpp @@ -52,7 +52,7 @@ m_widget = m_combo = new LabeledCombo(parent, QStringLiteral(""), QStringList()); readOption(); - m_widget->setToolTip(i18n(m_optDesc->desc)); + m_widget->setToolTip(sane_i18n(m_optDesc->desc)); connect(m_combo, static_cast(&LabeledCombo::activated), this, &KSaneOptCombo::comboboxChangedIndex); readValue(); } @@ -93,7 +93,7 @@ m_strList = genComboStringList(); m_combo->clear(); - m_combo->setLabelText(i18n(m_optDesc->title)); + m_combo->setLabelText(sane_i18n(m_optDesc->title)); m_combo->addItems(m_strList); m_combo->setIcon(QIcon::fromTheme(QStringLiteral("color")), getSaneComboString((unsigned char *)SANE_VALUE_SCAN_MODE_COLOR)); diff --git a/src/options/ksaneoptentry.cpp b/src/options/ksaneoptentry.cpp --- a/src/options/ksaneoptentry.cpp +++ b/src/options/ksaneoptentry.cpp @@ -56,8 +56,8 @@ return; } - m_widget = m_entry = new LabeledEntry(parent, i18n(m_optDesc->title)); - m_widget->setToolTip(i18n(m_optDesc->desc)); + m_widget = m_entry = new LabeledEntry(parent, sane_i18n(m_optDesc->title)); + m_widget->setToolTip(sane_i18n(m_optDesc->desc)); connect(m_entry, &LabeledEntry::entryEdited, this, &KSaneOptEntry::entryChanged); updateVisibility(); readValue(); diff --git a/src/options/ksaneoptfslider.cpp b/src/options/ksaneoptfslider.cpp --- a/src/options/ksaneoptfslider.cpp +++ b/src/options/ksaneoptfslider.cpp @@ -53,7 +53,7 @@ m_widget = m_slider = new LabeledFSlider(parent, QStringLiteral(""), FIXED_MIN, FIXED_MAX, MIN_FIXED_STEP); readOption(); - m_widget->setToolTip(i18n(m_optDesc->desc)); + m_widget->setToolTip(sane_i18n(m_optDesc->desc)); connect(m_slider, &LabeledFSlider::valueChanged, this, &KSaneOptFSlider::sliderChanged); readValue(); } @@ -81,7 +81,7 @@ } m_minChange = m_slider->step() / 2; m_slider->setSuffix(unitDoubleString()); - m_slider->setLabelText(i18n(m_optDesc->title)); + m_slider->setLabelText(sane_i18n(m_optDesc->title)); } void KSaneOptFSlider::readValue() diff --git a/src/options/ksaneoptgamma.cpp b/src/options/ksaneoptgamma.cpp --- a/src/options/ksaneoptgamma.cpp +++ b/src/options/ksaneoptgamma.cpp @@ -56,7 +56,7 @@ return; } - m_widget = m_gamma = new LabeledGamma(parent, i18n(m_optDesc->title), + m_widget = m_gamma = new LabeledGamma(parent, sane_i18n(m_optDesc->title), m_optDesc->size / sizeof(SANE_Word)); connect(m_gamma, &LabeledGamma::gammaTableChanged, this, &KSaneOptGamma::gammaTableChanged); if (strcmp(m_optDesc->name, SANE_NAME_GAMMA_VECTOR_R) == 0) { @@ -69,7 +69,7 @@ m_gamma->setColor(Qt::blue); } - m_widget->setToolTip(i18n(m_optDesc->desc)); + m_widget->setToolTip(sane_i18n(m_optDesc->desc)); updateVisibility(); readValue(); } diff --git a/src/options/ksaneoption.h b/src/options/ksaneoption.h --- a/src/options/ksaneoption.h +++ b/src/options/ksaneoption.h @@ -44,9 +44,15 @@ #include } +#define SANE_TRANSLATION_DOMAIN "sane-backends" + namespace KSaneIface { +inline QString sane_i18n(const char *text) { + return i18nd(SANE_TRANSLATION_DOMAIN, text); +} + class KSaneOptionWidget; class KSaneOption : public QObject diff --git a/src/options/ksaneoption.cpp b/src/options/ksaneoption.cpp --- a/src/options/ksaneoption.cpp +++ b/src/options/ksaneoption.cpp @@ -61,7 +61,7 @@ } if (m_optDesc) { - m_widget->setToolTip(i18n(m_optDesc->desc)); + m_widget->setToolTip(sane_i18n(m_optDesc->desc)); } readOption(); diff --git a/src/options/ksaneoptslider.cpp b/src/options/ksaneoptslider.cpp --- a/src/options/ksaneoptslider.cpp +++ b/src/options/ksaneoptslider.cpp @@ -53,7 +53,7 @@ m_widget = m_slider = new LabeledSlider(parent, QStringLiteral(""), KSW_INT_MIN, KSW_INT_MAX, 1); readOption(); - m_widget->setToolTip(i18n(m_optDesc->desc)); + m_widget->setToolTip(sane_i18n(m_optDesc->desc)); connect(m_slider, &LabeledSlider::valueChanged, this, &KSaneOptSlider::sliderChanged); readValue(); } @@ -96,7 +96,7 @@ m_slider->setStep(1); } m_slider->setSuffix(unitString()); - m_slider->setLabelText(i18n(m_optDesc->title)); + m_slider->setLabelText(sane_i18n(m_optDesc->title)); } void KSaneOptSlider::sliderChanged(int val)