Changeset 588

Timestamp:

09/25/06 13:39:32 (7 years ago)

Author:

koto

Message:

ExtendedFileManager bugfixes:

• editor does not display 'save' icon on systems that do not have Tahoma font installed
  (see http://xinha.gogo.co.nz/punbb/viewtopic.php?id=672)
  
• small i18n fixes
  
• added 'alt; attribute for new img element inserted in changeset:579
  
• cleaned up polish l10n file
  
• ImageManager Files::formatSize returns MB/KB instead of Mb/Kb
  
• small whitespace fixes in ImageManager/Classes/ImageManager?.php
  

Location:

trunk/plugins

Files:

• ExtendedFileManager/assets/editor.css (modified) (1 diff)
• ExtendedFileManager/assets/manager.js (modified) (1 diff)
• ExtendedFileManager/lang/pl.js (modified) (4 diffs)
• ExtendedFileManager/manager.php (modified) (1 diff)
• ImageManager/Classes/Files.php (modified) (1 diff)
• ImageManager/Classes/ImageManager.php (modified) (3 diffs)

trunk/plugins/ExtendedFileManager/assets/editor.css

@@ -193 +193 @@
         top: 490px;
 }
+
+#save_filename {width: 100px;}

trunk/plugins/ExtendedFileManager/assets/manager.js

@@ -200 +200 @@
         var opt = document.createElement("option");
         opt.value = "_other";
-        opt.innerHTML = "Other";
+        opt.innerHTML = i18n("Other");
         target_select.appendChild(opt);
         target_select.onchange = onTargetChanged;

trunk/plugins/ExtendedFileManager/lang/pl.js

@@ -38 +38 @@
   "File was not saved.": "Nie zapisano pliku.",
   "Start X:": "PoczÄ
-tek X",
+tek X:",
   "Start Y:": "PoczÄ
-tek Y",
+tek Y:",
   "Lock": "Zablokuj",
   "Flip Image": "Odwróć",
@@ -60 +60 @@
   'Delete folder "$dir"?': "$dir\n\nUsunÄ
 ć katalog ?",
-  "Folder Name:": "Nazwa katalogu",
   "No Files Found": "Nie znaleziono plików",
   "Invalid folder name, please choose another folder name.": "Nieprawidłowa nazwa katalogu, wybierz innÄ
@@ -67 +66 @@
   "No Image Available": "Obrazek niedostępny",
   "No Image selected.": "Nie zaznaczono obrazka.",
-  "Description:": "Opis:",
   "Align": "Wyrównanie",
-  "Description:": "Opis:",
-  "Margin:": "Margines:",
-  "Padding:": "Wcięcie:",
-  "Border:": "Ramka:",
-  "Color:": "Kolor:",
-  "Border Color:": "Kolor ramki:",
-  "Upload:": "Wgraj:",
-  "Alt": "Alt",
+  "Color": "Kolor",
+  "Border Color": "Kolor ramki",
   "Alt": "Alt",
   "File Name": "Nazwa pliku",
@@ -101 +93 @@
   "Unable to rename file. File of the same name already exists or\nfolder doesn't have write permission.": "Nie mogłem zmienić nazwy pliku. Plik o nowej nazwie juÅŒ istnieje\nlub prak praw zapisu do katalogu.",
   "Cancelled rename.": "Anulowano zmianę nazwy pliku.",
-   'File "$file" successfully uploaded.':  'File "$file" successfully uploaded.',
-  "Cannot upload. Maximum folder size reached. Delete unwanted files and try again.":"Cannot upload. Maximum folder size reached. Delete unwanted files and try again.",
-  "Maximum file size [$max_size KB] exceeded.":"Maximum file size [$max_size KB] exceeded.",
-  "Cannot upload $extension Files. Permission denied.": "Cannot upload $extension Files. Permission denied.",
-  "Unable to upload File. \nEither Maximum file size [$max_size KB] exceeded or\nFolder doesn\'t have write permission.":"Unable to upload File. \nEither Maximum file size [$max_size KB] exceeded or\nFolder doesn\'t have write permission.",
-  "Total Size : $max_foldersize_mb MB, Free Space: $free_space": "Total Size : $max_foldersize_mb MB, Free Space: $free_space"
+  'File "$file" successfully uploaded.':  'Plik "$file" wgrano na serwer.',
+  "Cannot upload. Maximum folder size reached. Delete unwanted files and try again.":"Wgrywanie nie powiodło się.\n\nPrzekroczono dozwolony limit miejsca. Usuń niechciane pliki i spróbuj ponownie.",
+  "Maximum file size [$max_size KB] exceeded.":"Wgrywanie nie powiodło się.\n\nPrzekroczono maksymalny rozmiar pliku [$max_size KB].",
+  "Cannot upload $extension Files. Permission denied.": "Nie moÅŒna było wgrać pliku.\n\nNiedozwolone rozszerzenie pliku [$extension].",
+  "Unable to upload File. \nEither Maximum file size [$max_size KB] exceeded or\nFolder doesn\'t have write permission.":"Wgrywanie nie powiodło się.\n\nPrzekroczono maksymalny rozmiar pliku [$max_size KB] lub nie ma ustawionych praw zapisu do folderu.",
+  "Total Size : $max_foldersize_mb MB, Free Space: $free_space": "Dostępny limit: $max_foldersize_mb MB, Wolne: $free_space"
 };

trunk/plugins/ExtendedFileManager/manager.php

@@ -152 +152 @@
             <td rowspan="<?php echo $num_rows ?>" colspan="2" valign="top"><?php if($insertMode=='image') { ?>
             <div style="padding:4px;background-color:#CCC;border:1px inset;width: 100px; height: 100px;">
-            <img src="<?php print $IMConfig['base_url'];?>img/1x1_transparent.gif" id="f_preview" />
+            <img src="<?php print $IMConfig['base_url'];?>img/1x1_transparent.gif" alt="" id="f_preview" />
             </div>
             <?php } else if($insertMode=="link" && $IMConfig['link_enable_target'] !== false) {?><label for="f_align">Target Window</label>

trunk/plugins/ImageManager/Classes/Files.php

@@ -207 +207 @@
                         return $size.' bytes';  
                 else if($size >= 1024 && $size < 1024*1024) 
-                        return sprintf('%01.2f',$size/1024.0).' Kb';    
-                else
-                        return sprintf('%01.2f',$size/(1024.0*1024)).' Mb';     
+                        return sprintf('%01.2f',$size/1024.0).' KB';
+                else
+                        return sprintf('%01.2f',$size/(1024.0*1024)).' MB';
         }
 

trunk/plugins/ImageManager/Classes/ImageManager.php

@@ -64 +64 @@
         /**
          * Get the tmp file prefix.
-     * @return string tmp file prefix.
+         * @return string tmp file prefix.
          */
         function getTmpPrefix() 
@@ -336 +336 @@
 
 
-        /**
+        /**
          * For a given image file, get the respective resized filename
          * no file existence check is done.
          * @param string $fullpathfile the full path to the image file
-   * @param integer $width the intended width
-   * @param integer $height the intended height
-   * @param boolean $mkDir whether to attempt to make the resized_dir if it doesn't exist
+         * @param integer $width the intended width
+         * @param integer $height the intended height
+         * @param boolean $mkDir whether to attempt to make the resized_dir if it doesn't exist
          * @return string of the resized filename
          */
@@ -357 +357 @@
                 else
                 {
-      $path = Files::makePath($path_parts['dirname'],$this->config['resized_dir']);
-      if($mkDir && !is_dir($path))
-        Files::createFolder($path);
-      Return Files::makeFile($path,$thumbnail);
+                        $path = Files::makePath($path_parts['dirname'],$this->config['resized_dir']);
+                        if($mkDir && !is_dir($path))
+                                Files::createFolder($path);
+                        Return Files::makeFile($path,$thumbnail);
                 }
         }