83e9c9c · unity8 · git.iko.soy

git.iko.soy/unity8

on xenial help sign in

Use gettext.

83e9c9cPawel Stolowski13 years ago

plugins/Unity/combinedfilteroption.cpp+5−2

compare with xenial

unifiedsplit

@@ -19,6 +19,8 @@

20#include "combinedfilteroption.h"

22+#include <libintl.h>

23+

22CombinedFilterOption::CombinedFilterOption(unity::dash::FilterOption::Ptr unityFilterOption1, unity::dash::FilterOption::Ptr unityFilterOption2, QObject *parent)

24CombinedFilterOption::CombinedFilterOption(unity::dash::FilterOption::Ptr unityFilterOption1, unity::dash::FilterOption::Ptr unityFilterOption2, QObject *parent)

23 : AbstractFilterOption(parent),

25 : AbstractFilterOption(parent),

24 m_active(false),

26 m_active(false),

@@ -37,10 +39,11 @@ QString CombinedFilterOption::getCombinedId() const

38QString CombinedFilterOption::getCombinedName() const

40QString CombinedFilterOption::getCombinedName() const

39{

41{

40− if (m_unityFilterOption[1] != nullptr)

42+ if (m_unityFilterOption[1] != nullptr) {

41− return tr("%1 - %2")

43+ return QString::fromStdString(gettext("%1 - %2"))

42 .arg(QString::fromStdString(m_unityFilterOption[0]->name()))

44 .arg(QString::fromStdString(m_unityFilterOption[0]->name()))

43 .arg(QString::fromStdString(m_unityFilterOption[1]->name()));

45 .arg(QString::fromStdString(m_unityFilterOption[1]->name()));

46+ }

44 return QString::fromStdString(m_unityFilterOption[0]->name());

47 return QString::fromStdString(m_unityFilterOption[0]->name());

45}

48}