Changeset 28815 for extensions/AMetaData

Timestamp:

Jun 27, 2014, 9:54:47 AM (10 years ago)

Author:

Youp3

Message:

Advanced Meta Data : prise en compte de la modification l10n / translate + sprintf

Location:

extensions/AMetaData

Files:

• amd_aip.class.inc.php (modified) (2 diffs)
• amd_aip_release.class.inc.php (modified) (1 diff)
• maintain.inc.php (modified) (1 diff)

extensions/AMetaData/amd_aip.class.inc.php

@@ -688 +688 @@
       $datas['nfoMetadata']['nfoSize']=sprintf('%.2fMio', $datas['nfoMetadata']['nfoSize']/1048576);
     }
-    $datas['nfoMetadata']['nfoSizeAndRows']=sprintf(l10n('g003_sizeAndRows'), $datas['nfoMetadata']['nfoSize'], $datas['nfoMetadata']['nfoRows']);
-    $datas['nfoMetadata']['numOfPictures']=sprintf(l10n('g003_numberOfAnalyzedPictures'), $datas['nfoMetadata']['numOfPictures']);
-    $datas['nfoMetadata']['numOfNotAnalyzedPictures']=sprintf(l10n('g003_numberOfNotAnalyzedPictures'), $datas['nfoMetadata']['numOfNotAnalyzedPictures']);
-    $datas['nfoMetadata']['numOfPicturesWithoutTag']=sprintf(l10n('g003_numberOfPicturesWithoutTags'), $datas['nfoMetadata']['numOfPicturesWithoutTag']);
+    $datas['nfoMetadata']['nfoSizeAndRows']=l10n('g003_sizeAndRows', $datas['nfoMetadata']['nfoSize'], $datas['nfoMetadata']['nfoRows']);
+    $datas['nfoMetadata']['numOfPictures']=l10n('g003_numberOfAnalyzedPictures', $datas['nfoMetadata']['numOfPictures']);
+    $datas['nfoMetadata']['numOfNotAnalyzedPictures']=l10n('g003_numberOfNotAnalyzedPictures', $datas['nfoMetadata']['numOfNotAnalyzedPictures']);
+    $datas['nfoMetadata']['numOfPicturesWithoutTag']=l10n('g003_numberOfPicturesWithoutTags', $datas['nfoMetadata']['numOfPicturesWithoutTag']);
 
     $template->assign("datas", $datas);
@@ -765 +765 @@
       'urlRequest' => $this->getAdminLink('ajax'),
       'NumberOfItemsPerRequest' => $this->config['amd_NumberOfItemsPerRequest'],
-      'caddieNbPictures' => ($caddieNbPictures==1)?l10n('g003_1_picture_in_caddie'):sprintf(l10n('g003_n_pictures_in_caddie'), $caddieNbPictures)
+      'caddieNbPictures' => ($caddieNbPictures==1)?l10n('g003_1_picture_in_caddie'):l10n('g003_n_pictures_in_caddie', $caddieNbPictures)
     );
 

extensions/AMetaData/amd_aip_release.class.inc.php

@@ -51 +51 @@
 
     $template->assign('plugin', $pluginInfo);
-    $template->assign('AMD_BODY_PAGE', '<p class="warnings">'.sprintf(l10n('g003_gpc_not_up_to_date'),AMD_GPC_NEEDED, GPC_VERSION).'</p>');
+    $template->assign('AMD_BODY_PAGE', '<p class="warnings">'.l10n('g003_gpc_not_up_to_date',AMD_GPC_NEEDED, GPC_VERSION).'</p>');
     $template->assign_var_from_handle('ADMIN_CONTENT', 'plugin_admin_content');
   }

extensions/AMetaData/maintain.inc.php

@@ -48 +48 @@
 function gpcMsgError(&$errors)
 {
-  $msg=sprintf(l10n('To install this plugin, you need to install Grum Plugin Classes %s before'), AMD_GPC_NEEDED);
+  $msg=l10n('To install this plugin, you need to install Grum Plugin Classes %s before', AMD_GPC_NEEDED);
   if(is_array($errors))
   {