Skip to content
Permalink
Browse files

Fix untranslatable strings (fix #11765)

  • Loading branch information
nyalldawson committed May 22, 2015
1 parent 803a0b9 commit df7e07bcf7889c79297eb5ff25ca6244ec71c82b
Showing with 19 additions and 18 deletions.
  1. +3 −3 src/core/qgscolorscheme.h
  2. +16 −15 src/core/qgsstatisticalsummary.cpp
@@ -183,7 +183,7 @@ class CORE_EXPORT QgsRecentColorScheme : public QgsColorScheme

virtual ~QgsRecentColorScheme();

virtual QString schemeName() const override { return QT_TR_NOOP( "Recent colors" ); }
virtual QString schemeName() const override { return QObject::tr( "Recent colors" ); }

virtual SchemeFlags flags() const override { return ShowInAllContexts; }

@@ -206,7 +206,7 @@ class CORE_EXPORT QgsCustomColorScheme : public QgsColorScheme

virtual ~QgsCustomColorScheme();

virtual QString schemeName() const override { return QT_TR_NOOP( "Standard colors" ); }
virtual QString schemeName() const override { return QObject::tr( "Standard colors" ); }

virtual SchemeFlags flags() const override { return ShowInAllContexts; }

@@ -233,7 +233,7 @@ class CORE_EXPORT QgsProjectColorScheme : public QgsColorScheme

virtual ~QgsProjectColorScheme();

virtual QString schemeName() const override { return QT_TR_NOOP( "Project colors" ); }
virtual QString schemeName() const override { return QObject::tr( "Project colors" ); }

virtual SchemeFlags flags() const override { return ShowInAllContexts; }

@@ -17,6 +17,7 @@
#include <limits>
#include <qmath.h>
#include <QString>
#include <QObject>

QgsStatisticalSummary::QgsStatisticalSummary( Statistics stats )
: mStatistics( stats )
@@ -220,35 +221,35 @@ QString QgsStatisticalSummary::displayName( QgsStatisticalSummary::Statistic sta
switch ( statistic )
{
case Count:
return QT_TR_NOOP( "Count" );
return QObject::tr( "Count" );
case Sum:
return QT_TR_NOOP( "Sum" );
return QObject::tr( "Sum" );
case Mean:
return QT_TR_NOOP( "Mean" );
return QObject::tr( "Mean" );
case Median:
return QT_TR_NOOP( "Median" );
return QObject::tr( "Median" );
case StDev:
return QT_TR_NOOP( "St dev (pop)" );
return QObject::tr( "St dev (pop)" );
case StDevSample:
return QT_TR_NOOP( "St dev (sample)" );
return QObject::tr( "St dev (sample)" );
case Min:
return QT_TR_NOOP( "Minimum" );
return QObject::tr( "Minimum" );
case Max:
return QT_TR_NOOP( "Maximum" );
return QObject::tr( "Maximum" );
case Range:
return QT_TR_NOOP( "Range" );
return QObject::tr( "Range" );
case Minority:
return QT_TR_NOOP( "Minority" );
return QObject::tr( "Minority" );
case Majority:
return QT_TR_NOOP( "Majority" );
return QObject::tr( "Majority" );
case Variety:
return QT_TR_NOOP( "Variety" );
return QObject::tr( "Variety" );
case FirstQuartile:
return QT_TR_NOOP( "Q1" );
return QObject::tr( "Q1" );
case ThirdQuartile:
return QT_TR_NOOP( "Q3" );
return QObject::tr( "Q3" );
case InterQuartileRange:
return QT_TR_NOOP( "IQR" );
return QObject::tr( "IQR" );
case All:
return QString();
}

0 comments on commit df7e07b

Please sign in to comment.