Improve handling of translations with '

diff --git a/adminer/include/lang.inc.php b/adminer/include/lang.inc.php
index eacd52288c57b3e4f3aec8f8018cf06b831c8486..61d0d0e110fc4d630f044681dff2030e65a6dad7 100644 (file)
--- a/adminer/include/lang.inc.php
+++ b/adminer/include/lang.inc.php
@@ -82,6 +82,7 @@ function lang($idf, $number = null) {
                ; // http://www.gnu.org/software/gettext/manual/html_node/Plural-forms.html
                $translation = $translation[$pos];
        }
+       $translation = str_replace("'", '’', $translation); // translations can contain HTML or be used in optionlist (we couldn't escape them here) but they can also be used e.g. in title='' //! escape plaintext translations
        $args = func_get_args();
        array_shift($args);
        $format = str_replace("%d", "%s", $translation);

diff --git a/adminer/lang/bg.inc.php b/adminer/lang/bg.inc.php
index a90a05f02b569c0862f54649de510d3440d97825..1a79d7d68d2a2c908ad73fd0d597e7ab07d9726d 100644 (file)
--- a/adminer/lang/bg.inc.php
+++ b/adminer/lang/bg.inc.php
@@ -256,7 +256,7 @@ $translations = array(
        // in-place editing in select
        'Modify' => 'Промяна',
        'Ctrl+click on a value to modify it.' => 'Ctrl+щракване в стойността, за да я промените.',
-       'Use edit link to modify this value.' => 'Използвайте "редакция" за промяна на данните.',
+       'Use edit link to modify this value.' => 'Използвайте \'редакция\' за промяна на данните.',
 
        // %s can contain auto-increment value
        'Item%s has been inserted.' => 'Елементи%s бяха вмъкнати.',

diff --git a/adminer/lang/fr.inc.php b/adminer/lang/fr.inc.php
index 06395ad8c5ab1905b95d4e23d42e030505401ee2..06e8d5946d1936c08e4b2f8612bc3af718372c1f 100644 (file)
--- a/adminer/lang/fr.inc.php
+++ b/adminer/lang/fr.inc.php
@@ -242,7 +242,7 @@ $translations = array(
        'Type has been dropped.' => 'Le type a été supprimé.',
        'Type has been created.' => 'Le type a été créé.',
        'Ctrl+click on a value to modify it.' => 'Ctrl+cliquez sur une valeur pour la modifier.',
-       'Use edit link to modify this value.' => 'Utilisez le lien "modifier" pour modifier cette valeur.',
+       'Use edit link to modify this value.' => 'Utilisez le lien \'modifier\' pour modifier cette valeur.',
        'last' => 'dernière',
        'From server' => 'Depuis le serveur',
        'System' => 'Système',

diff --git a/adminer/lang/lv.inc.php b/adminer/lang/lv.inc.php
index b44412ed39fc4e23d458b09a79ae7418963e622d..4ef050018a4b5cdd53197731369f14071b55acb1 100644 (file)
--- a/adminer/lang/lv.inc.php
+++ b/adminer/lang/lv.inc.php
@@ -243,7 +243,7 @@ $translations = array(
        'Type has been dropped.' => 'Tips dzēsts.',
        'Type has been created.' => 'Tips izveidots.',
        'Ctrl+click on a value to modify it.' => 'Lai izmainītu vērtību, izmanto Ctrl + peles klikšķi.',
-       'Use edit link to modify this value.' => 'Izmainīt vērtību var tikai ar saiti "Izmainīt".',
+       'Use edit link to modify this value.' => 'Izmainīt vērtību var tikai ar saiti \'Izmainīt\'.',
        'last' => 'pēdējā',
        'From server' => 'No servera',
        'System' => 'Sistēma',

diff --git a/adminer/lang/nl.inc.php b/adminer/lang/nl.inc.php
index 3d50db99c74c93d60c9c3b984554c81e9ca602b9..03580026d1a1a6d98ce1cc37ed81b2d57b293206 100644 (file)
--- a/adminer/lang/nl.inc.php
+++ b/adminer/lang/nl.inc.php
@@ -243,7 +243,7 @@ $translations = array(
        'Type has been dropped.' => 'Type verwijderd.',
        'Type has been created.' => 'Type aangemaakt.',
        'Ctrl+click on a value to modify it.' => 'Ctrl+klik op een waarde om deze te bewerken.',
-       'Use edit link to modify this value.' => 'Gebruik de link "bewerk" om deze waarde te wijzigen.',
+       'Use edit link to modify this value.' => 'Gebruik de link \'bewerk\' om deze waarde te wijzigen.',
        'last' => 'laatste',
        'From server' => 'Van server',
        'System' => 'Databasesysteem',