Changeset 1077:e80b1a400723

Timestamp:

12/18/12 11:34:38 (13 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Children:

1080:4f4478e9973d, 1081:862f566d2372

Message:

Better way to compose l10n message. Addresses #1308

Files:

• admin/index.php (modified) (2 diffs)
• locales/fr/main.po (modified) (1 diff)

admin/index.php

@@ -212 +212 @@
      echo
      '<p class="static-msg">'.
-     'DC_ADMIN_URL '.__('is not defined, you should edit your configuration file.').
+     sprintf(__('%s is not defined, you should edit your configuration file.'),'DC_ADMIN_URL').
+     ' '.__('See <a href="http://dotclear.org/documentation/2.0/admin/config">documentation</a> for more information.').
      '</p>';
 }
@@ -219 +220 @@
      echo
      '<p class="static-msg">'.
-     'DC_ADMIN_MAILFROM '.__('is not defined, you should edit your configuration file.').' '.
-     __('See <a href="http://dotclear.org/documentation/2.0/admin/config">documentation</a> for more information.').
+     sprintf(__('%s is not defined, you should edit your configuration file.'),'DC_ADMIN_MAILFROM').
+     ' '.__('See <a href="http://dotclear.org/documentation/2.0/admin/config">documentation</a> for more information.').
      '</p>';
 }

locales/fr/main.po

@@ -853 +853 @@
 msgstr "Ce blog est retiré de la publication"
 
-msgid "is not defined, you should edit your configuration file."
-msgstr "n'est pas défini, vous devriez corriger votre fichier de configuration."
+msgid "%s is not defined, you should edit your configuration file."
+msgstr "%s n'est pas défini, vous devriez corriger votre fichier de configuration."
 
 msgid "See <a href=\"http://dotclear.org/documentation/2.0/admin/config\">documentation</a> for more information."