Skip to content
Snippets Groups Projects
Commit 5575872f authored by Robert Lange's avatar Robert Lange
Browse files

refs #21546 [finc] i18n-merge: optimize console output

* remove trailing spaces
* print correct current key value
parent e7c53058
No related merge requests found
......@@ -130,7 +130,7 @@ do
#echo "$line"
# only add to instanceTokensOrder when key entry is NOT already existing -> remove duplicates / ignored by letting latest entry win
if [[ -n "${instanceTokens["$key"]}" ]]; then
echo "* remove duplicate token \"${key}\" with obsolete value ${instanceTokens["$key"]} by $value."
echo "* remove duplicate token \"${key% *}\" with obsolete value ${instanceTokens["$key"]} by \"${value#* }.\""
else
instanceTokensOrder+=("$key");
fi
......@@ -154,7 +154,7 @@ if [ -f "$PARENT_FILE" ]; then
# only add to instanceTokensOrder when key entry is NOT already existing -> remove duplicates / ignored by letting latest entry win
if [[ ${instanceTokens["$key"]} == "$value" ]] ; then
#instanceTokens["$key"]="$value";
echo "* remove duplicate token \"${key}\" and $value with parent file."
echo "* remove duplicate token \"${key% *}\" with value \"${value#* }.\" - use parent file."
instanceTokens["$key"]="X_duplicate_X";
fi
fi
......@@ -165,7 +165,7 @@ echo "Adding new token translations..."
for i in "${!newTokensOrder[@]}"
do
if [[ -n "${instanceTokens[${newTokensOrder[$i]}]}" ]]; then
echo "* replace token \"${newTokensOrder[$i]}\" with old value ${instanceTokens[${newTokensOrder[$i]}]} by new value $value"
echo "* set new value for token \"${newTokensOrder[$i]}\" with value ${newTokens[${newTokensOrder[$i]}]}"
else
instanceTokensOrder+=("${newTokensOrder[$i]}");
echo "* add new token \"${newTokensOrder[$i]}\" with value ${newTokens[${newTokensOrder[$i]}]}"
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment