Merge pull request #8740 from DelazJ/translateExpr

m-kuhn · web-flow · commit 4fe3887c1f1a · 2018-12-25T09:47:00.000+01:00
Expression parser fixes [Backport]
diff --git a/scripts/update_ts.sh b/scripts/update_ts.sh
@@ -79,7 +79,7 @@ files=
 if [ -d "$2" ]; then
 	builddir=$(realpath $2)
 	textcpp=
-	for i in $builddir/src/core/qgsexpression_texts.cpp; do
+	for i in $builddir/src/core/qgsexpression_texts.cpp $builddir/src/core/qgsexpressionparser.cpp; do
 		if [ -f $i ]; then
 			textcpp="$textcpp $i"
 		elif [ "$action" != "pull" ]; then
diff --git a/scripts/update_ts_files.sh b/scripts/update_ts_files.sh
@@ -126,7 +126,7 @@ done
 echo Updating GRASS module translations
 perl scripts/qgm2cpp.pl >src/plugins/grass/grasslabels-i18n.cpp
 echo Creating qmake project file
-$QMAKE -project -o qgis_ts.pro -nopwd src python i18n "$builddir/src/core/qgsexpression_texts.cpp"
+$QMAKE -project -o qgis_ts.pro -nopwd src python i18n "$builddir/src/core/qgsexpression_texts.cpp" "$builddir/src/core/qgsexpressionparser.cpp"
 if [ -n "$add" ]; then
 	for i in $add; do
 		echo "Adding translation for $i"
diff --git a/src/core/qgsexpressionparser.yy b/src/core/qgsexpressionparser.yy
@@ -217,7 +217,7 @@ expression:
           {
             QgsExpression::ParserError::ParserErrorType errorType = QgsExpression::ParserError::FunctionUnknown;
             parser_ctx->currentErrorType = errorType;
-            exp_error(&yyloc, parser_ctx, "Function is not known");
+            exp_error(&yyloc, parser_ctx, QObject::tr( "Function is not known" ).toUtf8().constData() );
             delete $3;
             YYERROR;
           }
@@ -238,21 +238,19 @@ expression:
             QgsExpression::ParserError::ParserErrorType errorType = QgsExpression::ParserError::FunctionWrongArgs;
             parser_ctx->currentErrorType = errorType;
             QString expectedMessage;
-            if (func->params() == func->minParams())
+            if ( func->params() == func->minParams() )
             {
-               expectedMessage = QString("Expected %2" ).arg( func->params());
+               expectedMessage = QObject::tr( "Expected %1 but got %2." ).arg( QString::number( func->params() ), QString::number( $3->count() ) );
             }
             else
             {
-               expectedMessage = QString("Expected between %2 and %4 max but got %3" ).arg( func->minParams(), func->params() );
+               expectedMessage = QObject::tr( "Expected between %1 and %2 parameters but %3 were provided." ).arg( QString::number( func->minParams() ), QString::number( func->params() ), QString::number( $3->count() ) );
             }
-            exp_error(&yyloc, parser_ctx, QString( "%1 function is called with wrong number of arguments."
-                                                   "%2 but got %3" ).arg( QgsExpression::Functions()[fnIndex]->name() )
-                                                                             .arg( expectedMessage )
-                                                                             .arg( $3->count() ).toLocal8Bit().constData() );
+            exp_error(&yyloc, parser_ctx, QObject::tr( "%1 function is called with wrong number of arguments. %2" ).arg( QgsExpression::Functions()[fnIndex]->name(), expectedMessage ).toUtf8().constData() );
             delete $3;
             YYERROR;
           }
+
           $$ = new QgsExpressionNodeFunction(fnIndex, $3);
           addParserLocation(&@1, $$);
         }
@@ -265,7 +263,7 @@ expression:
           {
             QgsExpression::ParserError::ParserErrorType errorType = QgsExpression::ParserError::FunctionUnknown;
             parser_ctx->currentErrorType = errorType;
-            exp_error(&yyloc, parser_ctx, "Function is not known");
+            exp_error(&yyloc, parser_ctx, QObject::tr( "Function is not known" ).toUtf8().constData() );
             YYERROR;
           }
           // 0 parameters is expected, -1 parameters means leave it to the
@@ -274,7 +272,7 @@ expression:
           {
             QgsExpression::ParserError::ParserErrorType errorType = QgsExpression::ParserError::FunctionWrongArgs;
             parser_ctx->currentErrorType = errorType;
-            exp_error(&yyloc, parser_ctx, QString( "%1 function is called with wrong number of arguments" ).arg( QgsExpression::Functions()[fnIndex]->name() ).toLocal8Bit().constData() );
+            exp_error(&yyloc, parser_ctx, QObject::tr( "%1 function is called with wrong number of arguments" ).arg( QgsExpression::Functions()[fnIndex]->name() ).toLocal8Bit().constData() );
             YYERROR;
           }
           $$ = new QgsExpressionNodeFunction(fnIndex, new QgsExpressionNode::NodeList());
@@ -306,7 +304,7 @@ expression:
           {
             QgsExpression::ParserError::ParserErrorType errorType = QgsExpression::ParserError::FunctionUnknown;
             parser_ctx->currentErrorType = errorType;
-            exp_error(&yyloc, parser_ctx, QString("%1 function is not known").arg(*$1).toLocal8Bit().constData());
+            exp_error(&yyloc, parser_ctx, QObject::tr( "%1 function is not known" ).arg( *$1 ).toLocal8Bit().constData());
             YYERROR;
           }
           delete $1;
@@ -317,7 +315,7 @@ expression:
         {
           // @var is equivalent to var( "var" )
           QgsExpressionNode::NodeList* args = new QgsExpressionNode::NodeList();
-          QgsExpressionNodeLiteral* literal = new QgsExpressionNodeLiteral( QString(*$1).mid(1) );
+          QgsExpressionNodeLiteral* literal = new QgsExpressionNodeLiteral( QString( *$1 ).mid( 1 ) );
           args->append( literal );
           $$ = new QgsExpressionNodeFunction( QgsExpression::functionIndex( "var" ), args );
           delete $1;
@@ -342,7 +340,7 @@ exp_list:
          {
            QgsExpression::ParserError::ParserErrorType errorType = QgsExpression::ParserError::FunctionNamedArgsError;
            parser_ctx->currentErrorType = errorType;
-           exp_error(&yyloc, parser_ctx, "All parameters following a named parameter must also be named.");
+           exp_error(&yyloc, parser_ctx, QObject::tr( "All parameters following a named parameter must also be named." ).toUtf8().constData() );
            delete $1;
            YYERROR;
          }

Original file line number	Diff line number	Diff line change
`@@ -217,7 +217,7 @@ expression:`
`217`	`217`	`{`
`218`	`218`	`QgsExpression::ParserError::ParserErrorType errorType = QgsExpression::ParserError::FunctionUnknown;`
`219`	`219`	`parser_ctx->currentErrorType = errorType;`
`220`		`- exp_error(&yyloc, parser_ctx, "Function is not known");`
	`220`	`+ exp_error(&yyloc, parser_ctx, QObject::tr( "Function is not known" ).toUtf8().constData() );`
`221`	`221`	`delete $3;`
`222`	`222`	`YYERROR;`
`223`	`223`	`}`
`@@ -238,21 +238,19 @@ expression:`
`238`	`238`	`QgsExpression::ParserError::ParserErrorType errorType = QgsExpression::ParserError::FunctionWrongArgs;`
`239`	`239`	`parser_ctx->currentErrorType = errorType;`
`240`	`240`	`QString expectedMessage;`
`241`		`- if (func->params() == func->minParams())`
	`241`	`+ if ( func->params() == func->minParams() )`
`242`	`242`	`{`
`243`		`- expectedMessage = QString("Expected %2" ).arg( func->params());`
	`243`	`+ expectedMessage = QObject::tr( "Expected %1 but got %2." ).arg( QString::number( func->params() ), QString::number( $3->count() ) );`
`244`	`244`	`}`
`245`	`245`	`else`
`246`	`246`	`{`
`247`		`- expectedMessage = QString("Expected between %2 and %4 max but got %3" ).arg( func->minParams(), func->params() );`
	`247`	`+ expectedMessage = QObject::tr( "Expected between %1 and %2 parameters but %3 were provided." ).arg( QString::number( func->minParams() ), QString::number( func->params() ), QString::number( $3->count() ) );`
`248`	`248`	`}`
`249`		`- exp_error(&yyloc, parser_ctx, QString( "%1 function is called with wrong number of arguments."`
`250`		`- "%2 but got %3" ).arg( QgsExpression::Functions()[fnIndex]->name() )`
`251`		`- .arg( expectedMessage )`
`252`		`- .arg( $3->count() ).toLocal8Bit().constData() );`
	`249`	`+ exp_error(&yyloc, parser_ctx, QObject::tr( "%1 function is called with wrong number of arguments. %2" ).arg( QgsExpression::Functions()[fnIndex]->name(), expectedMessage ).toUtf8().constData() );`
`253`	`250`	`delete $3;`
`254`	`251`	`YYERROR;`
`255`	`252`	`}`
	`253`	`+`
`256`	`254`	`$$ = new QgsExpressionNodeFunction(fnIndex, $3);`
`257`	`255`	`addParserLocation(&@1, $$);`
`258`	`256`	`}`
`@@ -265,7 +263,7 @@ expression:`
`265`	`263`	`{`
`266`	`264`	`QgsExpression::ParserError::ParserErrorType errorType = QgsExpression::ParserError::FunctionUnknown;`
`267`	`265`	`parser_ctx->currentErrorType = errorType;`
`268`		`- exp_error(&yyloc, parser_ctx, "Function is not known");`
	`266`	`+ exp_error(&yyloc, parser_ctx, QObject::tr( "Function is not known" ).toUtf8().constData() );`
`269`	`267`	`YYERROR;`
`270`	`268`	`}`
`271`	`269`	`// 0 parameters is expected, -1 parameters means leave it to the`
`@@ -274,7 +272,7 @@ expression:`
`274`	`272`	`{`
`275`	`273`	`QgsExpression::ParserError::ParserErrorType errorType = QgsExpression::ParserError::FunctionWrongArgs;`
`276`	`274`	`parser_ctx->currentErrorType = errorType;`
`277`		`- exp_error(&yyloc, parser_ctx, QString( "%1 function is called with wrong number of arguments" ).arg( QgsExpression::Functions()[fnIndex]->name() ).toLocal8Bit().constData() );`
	`275`	`+ exp_error(&yyloc, parser_ctx, QObject::tr( "%1 function is called with wrong number of arguments" ).arg( QgsExpression::Functions()[fnIndex]->name() ).toLocal8Bit().constData() );`
`278`	`276`	`YYERROR;`
`279`	`277`	`}`
`280`	`278`	`$$ = new QgsExpressionNodeFunction(fnIndex, new QgsExpressionNode::NodeList());`
`@@ -306,7 +304,7 @@ expression:`
`306`	`304`	`{`
`307`	`305`	`QgsExpression::ParserError::ParserErrorType errorType = QgsExpression::ParserError::FunctionUnknown;`
`308`	`306`	`parser_ctx->currentErrorType = errorType;`
`309`		`- exp_error(&yyloc, parser_ctx, QString("%1 function is not known").arg(*$1).toLocal8Bit().constData());`
	`307`	`+ exp_error(&yyloc, parser_ctx, QObject::tr( "%1 function is not known" ).arg( *$1 ).toLocal8Bit().constData());`
`310`	`308`	`YYERROR;`
`311`	`309`	`}`
`312`	`310`	`delete $1;`
`@@ -317,7 +315,7 @@ expression:`
`317`	`315`	`{`
`318`	`316`	`// @var is equivalent to var( "var" )`
`319`	`317`	`QgsExpressionNode::NodeList* args = new QgsExpressionNode::NodeList();`
`320`		`- QgsExpressionNodeLiteral* literal = new QgsExpressionNodeLiteral( QString(*$1).mid(1) );`
	`318`	`+ QgsExpressionNodeLiteral* literal = new QgsExpressionNodeLiteral( QString( *$1 ).mid( 1 ) );`
`321`	`319`	`args->append( literal );`
`322`	`320`	`$$ = new QgsExpressionNodeFunction( QgsExpression::functionIndex( "var" ), args );`
`323`	`321`	`delete $1;`
`@@ -342,7 +340,7 @@ exp_list:`
`342`	`340`	`{`
`343`	`341`	`QgsExpression::ParserError::ParserErrorType errorType = QgsExpression::ParserError::FunctionNamedArgsError;`
`344`	`342`	`parser_ctx->currentErrorType = errorType;`
`345`		`- exp_error(&yyloc, parser_ctx, "All parameters following a named parameter must also be named.");`
	`343`	`+ exp_error(&yyloc, parser_ctx, QObject::tr( "All parameters following a named parameter must also be named." ).toUtf8().constData() );`
`346`	`344`	`delete $1;`
`347`	`345`	`YYERROR;`
`348`	`346`	`}`