Permalink
Browse files

Introduce argument indexes in some translation strings, to fix crashe…

…s with Japanese and probably other languages, when grammar changes the order of arguments. Closes #55.
  • Loading branch information...
ansgarbecker committed Dec 22, 2017
1 parent 19a1c3f commit dac303d8f6be80e29085f1ef25304402dec51339
Showing with 13 additions and 13 deletions.
  1. +9 −9 out/locale/en/LC_MESSAGES/default.po
  2. +4 −4 source/dbconnection.pas
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: HeidiSQL\n"
"POT-Creation-Date: 2012-11-05 21:40\n"
"PO-Revision-Date: 2017-03-13 21:17+0100\n"
"PO-Revision-Date: 2017-12-22 10:26+0100\n"
"Last-Translator: Ansgar Becker <anse@heidisql.com>\n"
"Language-Team: English (http://www.transifex.com/projects/p/heidisql/"
"language/en/)\n"
@@ -5888,20 +5888,20 @@ msgid "Characterset"
msgstr "Characterset"
#. Error happening when facing unknown native data types, mainly in PostgreSQL tables and routines.
msgid "Unknown datatype oid #%d. Fall back to %s."
msgstr "Unknown datatype oid #%d. Fall back to %s."
msgid "Unknown datatype oid #%0:d. Fall back to %1:s."
msgstr "Unknown datatype oid #%0:d. Fall back to %1:s."
#. Error happening when facing unknown native data types, mainly in PostgreSQL tables and routines. Name of column or argument passed here as a hint for the user.
msgid "Unknown datatype oid #%d for \"%s\". Fall back to %s."
msgstr "Unknown datatype oid #%d for \"%s\". Fall back to %s."
msgid "Unknown datatype oid #%0:d for \"%1:s\". Fall back to %2:s."
msgstr "Unknown datatype oid #%0:d for \"%1:s\". Fall back to %2:s."
#. Error happening when facing unknown named data types.
msgid "Unknown datatype \"%s\" for \"%s\". Fall back to %s."
msgstr "Unknown datatype \"%s\" for \"%s\". Fall back to %s."
msgid "Unknown datatype \"%0:s\" for \"%1:s\". Fall back to %2:s."
msgstr "Unknown datatype \"%0:s\" for \"%1:s\". Fall back to %2:s."
#. Error happening when facing unknown named data types. Name of column or argument passed here as a hint for the user.
msgid "Unknown datatype \"%s\". Fall back to %s."
msgstr "Unknown datatype \"%s\". Fall back to %s."
msgid "Unknown datatype \"%0:s\". Fall back to %1:s."
msgstr "Unknown datatype \"%0:s\". Fall back to %1:s."
msgid "GUID"
msgstr "GUID"
View
@@ -1516,9 +1516,9 @@ function TDBConnection.GetDatatypeByName(var DataType: String; DeleteFromSource:
else
tmp := DataType;
if Identifier <> '' then
Log(lcError, f_('Unknown datatype "%s" for "%s". Fall back to %s.', [tmp, Identifier, Result.Name]))
Log(lcError, f_('Unknown datatype "%0:s" for "%1:s". Fall back to %2:s.', [tmp, Identifier, Result.Name]))
else
Log(lcError, f_('Unknown datatype "%s". Fall back to %s.', [tmp, Result.Name]));
Log(lcError, f_('Unknown datatype "%0:s". Fall back to %1:s.', [tmp, Result.Name]));
end;
rx.Free;
end;
@@ -1546,9 +1546,9 @@ function TDBConnection.GetDatatypeByNativeType(NativeType: Integer; Identifier:
// Fall back to unknown type
Result := Datatypes[0];
if Identifier <> '' then
Log(lcError, f_('Unknown datatype oid #%d for "%s". Fall back to %s.', [NativeType, Identifier, Result.Name]))
Log(lcError, f_('Unknown datatype oid #%0:d for "%1:s". Fall back to %2:s.', [NativeType, Identifier, Result.Name]))
else
Log(lcError, f_('Unknown datatype oid #%d. Fall back to %s.', [NativeType, Result.Name]));
Log(lcError, f_('Unknown datatype oid #%0:d. Fall back to %1:s.', [NativeType, Result.Name]));
end;
end;

0 comments on commit dac303d

Please sign in to comment.