Dotclear

Changeset 1039:b5eab1d920f7


Ignore:
Timestamp:
11/26/12 22:04:37 (13 years ago)
Author:
franck <carnet.franck.paul@…>
Branch:
default
Message:

The media enhanced uploader may now be temporarily enabled or disabled, fixes #1284

Files:
32 edited

Legend:

Unmodified
Added
Removed

  • admin/js/_media.js

    r740 r1039  
    1717      
    1818     if (!$.browser.opera) { 
    19           if (dotclear.candyUpload_force_init == '1') { 
     19          var upldr = $('<a href="#" id="cu-enable">' + dotclear.msg.activate_enhanced_uploader + '</a>').click( function() { 
     20               candyUploadInit(); 
     21               return false; 
     22          }); 
     23          $('#media-upload').append($('<div></div>').append(upldr)); 
     24          if ((dotclear.candyUpload_force_init == '1') || (($.cookie('dc_candy_upl') == 1))) { 
    2025               candyUploadInit(); 
    2126          } 
    … …  
    3843                         this.ctrl.btn_browse.hide(); 
    3944                         this.ctrl.msg.html(dotclear.msg.load_enhanced_uploader); 
     45                         var l = $('<a href="#">' + dotclear.msg.disable_enhanced_uploader + '</a>').click(function() { 
     46                              _this.upldr.destroy(); 
     47                              _this.ctrl.block.empty().remove(); 
     48                              $('#media-upload').show(); 
     49                              delete _this; 
     50                              $.cookie('dc_candy_upl','',{expires:-1}); 
     51                              return false; 
     52                         }); 
     53                         this.ctrl.disable = $('<div class="cu-disable"></div>').append(l).appendTo(this.ctrl.block); 
    4054                    }, 
    4155                    flashReady: function() { 

  • admin/media.php

    r977 r1039  
    251251     "</script>". 
    252252     dcPage::jsLoad('js/_media.js'). 
    253      (($user_ui_enhanceduploader && $core_media_writable) ? dcPage::jsCandyUpload(array('d='.$d)) : '') 
     253     ($core_media_writable ? dcPage::jsCandyUpload(array('d='.$d)) : '') 
    254254     ); 
    255255 
    … …  
    356356     '<p><label for="upfiletitle">'.__('Title:').form::field(array('upfiletitle','upfiletitle'),35,255).'</label></p>'. 
    357357     '<p><label for="upfilepriv" class="classic">'.form::checkbox(array('upfilepriv','upfilepriv'),1).' '. 
    358      __('Private').'</label></p>'. 
    359      '<p class="form-help info">'.__('To send several files at the same time, you can activate the enhanced uploader in'). 
    360      ' <a href="preferences.php?tab=user-options">'.__('My preferences').'</a></p>'. 
     358     __('Private').'</label></p>'; 
     359     if (!$user_ui_enhanceduploader) { 
     360          echo 
     361          '<p class="form-help info">'.__('To send several files at the same time, you can activate the enhanced uploader in'). 
     362          ' <a href="preferences.php?tab=user-options">'.__('My preferences').'</a></p>'; 
     363     } 
     364     echo 
    361365     '<p><input type="submit" value="'.__('Send').'" />'. 
    362366     form::hidden(array('d'),$d).'</p>'. 

  • inc/admin/lib.dc.page.php

    r1019 r1039  
    687687          "//<![CDATA[\n". 
    688688          "dotclear.candyUpload = {};\n". 
    689           self::jsVar('dotclear.msg.activate_enhanced_uploader',__('Activate enhanced uploader')). 
    690           self::jsVar('dotclear.msg.disable_enhanced_uploader',__('Disable enhanced uploader')). 
     689          self::jsVar('dotclear.msg.activate_enhanced_uploader',__('Temporarily activate enhanced uploader')). 
     690          self::jsVar('dotclear.msg.disable_enhanced_uploader',__('Temporarily disable enhanced uploader')). 
    691691          self::jsVar('$._candyUpload.prototype.locales.file_uploaded',__('File successfully uploaded.')). 
    692692          self::jsVar('$._candyUpload.prototype.locales.max_file_size',__('Maximum file size allowed:')). 

  • locales/_pot/main.pot

    r963 r1039  
    31383138 
    31393139#: inc/admin/lib.dc.page.php:688 
    3140 msgid "Activate enhanced uploader" 
     3140msgid "Temporarily activate enhanced uploader" 
    31413141msgstr "" 
    31423142 
    31433143#: inc/admin/lib.dc.page.php:689 
    3144 msgid "Disable enhanced uploader" 
     3144msgid "Temporarily disable enhanced uploader" 
    31453145msgstr "" 
    31463146 

  • locales/bn/main.po

    r759 r1039  
    23002300msgstr "" 
    23012301 
    2302 msgid "Activate enhanced uploader" 
    2303 msgstr "" 
    2304  
    2305 msgid "Disable enhanced uploader" 
     2302msgid "Temporarily activate enhanced uploader" 
     2303msgstr "" 
     2304 
     2305msgid "Temporarily disable enhanced uploader" 
    23062306msgstr "" 
    23072307 

  • locales/ca/main.po

    r759 r1039  
    23802380msgstr "" 
    23812381 
    2382 msgid "Activate enhanced uploader" 
    2383 msgstr "" 
    2384  
    2385 msgid "Disable enhanced uploader" 
     2382msgid "Temporarily activate enhanced uploader" 
     2383msgstr "" 
     2384 
     2385msgid "Temporarily disable enhanced uploader" 
    23862386msgstr "" 
    23872387 

  • locales/cs/main.po

    r759 r1039  
    23032303msgstr "Odkaz na článek" 
    23042304 
    2305 msgid "Activate enhanced uploader" 
     2305msgid "Temporarily activate enhanced uploader" 
    23062306msgstr "Zapnout rozšířený uploader" 
    23072307 
    2308 msgid "Disable enhanced uploader" 
     2308msgid "Temporarily disable enhanced uploader" 
    23092309msgstr "Vypnout rozšířený uploader" 
    23102310 

  • locales/da/main.po

    r759 r1039  
    23112311msgstr "" 
    23122312 
    2313 msgid "Activate enhanced uploader" 
    2314 msgstr "" 
    2315  
    2316 msgid "Disable enhanced uploader" 
     2313msgid "Temporarily activate enhanced uploader" 
     2314msgstr "" 
     2315 
     2316msgid "Temporarily disable enhanced uploader" 
    23172317msgstr "" 
    23182318 

  • locales/de/main.po

    r759 r1039  
    23032303msgstr "Link zu einen Blog-Eintrag" 
    23042304 
    2305 msgid "Activate enhanced uploader" 
     2305msgid "Temporarily activate enhanced uploader" 
    23062306msgstr "Erweiterten Uploader starten" 
    23072307 
    2308 msgid "Disable enhanced uploader" 
     2308msgid "Temporarily disable enhanced uploader" 
    23092309msgstr "Erweiterten Uploader abschalten" 
    23102310 

  • locales/en/main.po

    r901 r1039  
    22532253msgstr "" 
    22542254 
    2255 msgid "Activate enhanced uploader" 
    2256 msgstr "" 
    2257  
    2258 msgid "Disable enhanced uploader" 
     2255msgid "Temporarily activate enhanced uploader" 
     2256msgstr "" 
     2257 
     2258msgid "Temporarily disable enhanced uploader" 
    22592259msgstr "" 
    22602260 

  • locales/eo/main.po

    r759 r1039  
    22502250msgstr "" 
    22512251 
    2252 msgid "Activate enhanced uploader" 
    2253 msgstr "" 
    2254  
    2255 msgid "Disable enhanced uploader" 
     2252msgid "Temporarily activate enhanced uploader" 
     2253msgstr "" 
     2254 
     2255msgid "Temporarily disable enhanced uploader" 
    22562256msgstr "" 
    22572257 

  • locales/es-ar/main.po

    r759 r1039  
    23182318msgstr "Enlace a una entrada" 
    23192319 
    2320 msgid "Activate enhanced uploader" 
     2320msgid "Temporarily activate enhanced uploader" 
    23212321msgstr "Activar ventajas de subida" 
    23222322 
    2323 msgid "Disable enhanced uploader" 
     2323msgid "Temporarily disable enhanced uploader" 
    23242324msgstr "Desactivar ventajas de subida" 
    23252325 

  • locales/es/main.po

    r759 r1039  
    23232323msgstr "Enlace a una entrada" 
    23242324 
    2325 msgid "Activate enhanced uploader" 
     2325msgid "Temporarily activate enhanced uploader" 
    23262326msgstr "Activar la interfaz avanzada" 
    23272327 
    2328 msgid "Disable enhanced uploader" 
     2328msgid "Temporarily disable enhanced uploader" 
    23292329msgstr "Inhabilitar la interfaz avanzada" 
    23302330 

  • locales/eu/main.po

    r759 r1039  
    22502250msgstr "" 
    22512251 
    2252 msgid "Activate enhanced uploader" 
    2253 msgstr "" 
    2254  
    2255 msgid "Disable enhanced uploader" 
     2252msgid "Temporarily activate enhanced uploader" 
     2253msgstr "" 
     2254 
     2255msgid "Temporarily disable enhanced uploader" 
    22562256msgstr "" 
    22572257 

  • locales/fr/main.po

    r1017 r1039  
    23362336msgstr "Lien vers une entrée" 
    23372337 
    2338 msgid "Activate enhanced uploader" 
    2339 msgstr "Activer l'interface avancée" 
    2340  
    2341 msgid "Disable enhanced uploader" 
    2342 msgstr "Désactiver l'interface avancée" 
     2338msgid "Temporarily activate enhanced uploader" 
     2339msgstr "Activer temporairement l'interface avancée" 
     2340 
     2341msgid "Temporarily disable enhanced uploader" 
     2342msgstr "Désactiver temporairement l'interface avancée" 
    23432343 
    23442344msgid "File successfully uploaded." 

  • locales/hu/main.po

    r759 r1039  
    23592359msgstr "Hivatkozás egy bejegyzésre" 
    23602360 
    2361 msgid "Activate enhanced uploader" 
     2361msgid "Temporarily activate enhanced uploader" 
    23622362msgstr "Bővített fájlfeltöltő aktiválása" 
    23632363 
    2364 msgid "Disable enhanced uploader" 
     2364msgid "Temporarily disable enhanced uploader" 
    23652365msgstr "Bővített fájlfeltöltő kikapcsolása" 
    23662366 

  • locales/it/main.po

    r759 r1039  
    23022302msgstr "Link ad un articolo" 
    23032303 
    2304 msgid "Activate enhanced uploader" 
     2304msgid "Temporarily activate enhanced uploader" 
    23052305msgstr "Attiva il caricamento avanzato" 
    23062306 
    2307 msgid "Disable enhanced uploader" 
     2307msgid "Temporarily disable enhanced uploader" 
    23082308msgstr "Disattiva il caricamento avanzato" 
    23092309 

  • locales/ja/main.po

    r759 r1039  
    23322332msgstr "エントリへのリンク" 
    23332333 
    2334 msgid "Activate enhanced uploader" 
     2334msgid "Temporarily activate enhanced uploader" 
    23352335msgstr "拡張アップローダを有効化" 
    23362336 
    2337 msgid "Disable enhanced uploader" 
     2337msgid "Temporarily disable enhanced uploader" 
    23382338msgstr "拡張アップローダを無効化" 
    23392339 

  • locales/ko/main.po

    r759 r1039  
    23332333msgstr "다른 글꼭지로 링크" 
    23342334 
    2335 msgid "Activate enhanced uploader" 
     2335msgid "Temporarily activate enhanced uploader" 
    23362336msgstr "복수파일 동시전송 모드로 전환" 
    23372337 
    2338 msgid "Disable enhanced uploader" 
     2338msgid "Temporarily disable enhanced uploader" 
    23392339msgstr "기본 모드로 전환" 
    23402340 

  • locales/lt/main.po

    r813 r1039  
    21092109msgstr "Nuoroda į įrašą" 
    21102110 
    2111 msgid "Activate enhanced uploader" 
     2111msgid "Temporarily activate enhanced uploader" 
    21122112msgstr "Įjungti enhanced Uploader" 
    21132113 
    2114 msgid "Disable enhanced uploader" 
     2114msgid "Temporarily disable enhanced uploader" 
    21152115msgstr "Išjungti enhanced uploader" 
    21162116 

  • locales/nl/main.po

    r759 r1039  
    22642264msgstr "" 
    22652265 
    2266 msgid "Activate enhanced uploader" 
    2267 msgstr "" 
    2268  
    2269 msgid "Disable enhanced uploader" 
     2266msgid "Temporarily activate enhanced uploader" 
     2267msgstr "" 
     2268 
     2269msgid "Temporarily disable enhanced uploader" 
    22702270msgstr "" 
    22712271 

  • locales/oc/main.po

    r759 r1039  
    22832283msgstr "" 
    22842284 
    2285 msgid "Activate enhanced uploader" 
    2286 msgstr "" 
    2287  
    2288 msgid "Disable enhanced uploader" 
     2285msgid "Temporarily activate enhanced uploader" 
     2286msgstr "" 
     2287 
     2288msgid "Temporarily disable enhanced uploader" 
    22892289msgstr "" 
    22902290 

  • locales/pl/main.po

    r759 r1039  
    22762276msgstr "Odnośnik do wpisu" 
    22772277 
    2278 msgid "Activate enhanced uploader" 
     2278msgid "Temporarily activate enhanced uploader" 
    22792279msgstr "Włącz ulepszony uploader" 
    22802280 
    2281 msgid "Disable enhanced uploader" 
     2281msgid "Temporarily disable enhanced uploader" 
    22822282msgstr "Wyłącz ulepszony uploader" 
    22832283 

  • locales/pt-br/main.po

    r759 r1039  
    23992399msgstr "Link para um post" 
    24002400 
    2401 msgid "Activate enhanced uploader" 
    2402 msgstr "" 
    2403  
    2404 msgid "Disable enhanced uploader" 
     2401msgid "Temporarily activate enhanced uploader" 
     2402msgstr "" 
     2403 
     2404msgid "Temporarily disable enhanced uploader" 
    24052405msgstr "" 
    24062406 

  • locales/pt/main.po

    r759 r1039  
    23102310msgstr "Adicionar um link a uma entrada" 
    23112311 
    2312 msgid "Activate enhanced uploader" 
     2312msgid "Temporarily activate enhanced uploader" 
    23132313msgstr "Activar o uploader" 
    23142314 
    2315 msgid "Disable enhanced uploader" 
     2315msgid "Temporarily disable enhanced uploader" 
    23162316msgstr "Desactivar o uploader" 
    23172317 

  • locales/ro/main.po

    r842 r1039  
    22612261msgstr "" 
    22622262 
    2263 msgid "Activate enhanced uploader" 
    2264 msgstr "" 
    2265  
    2266 msgid "Disable enhanced uploader" 
     2263msgid "Temporarily activate enhanced uploader" 
     2264msgstr "" 
     2265 
     2266msgid "Temporarily disable enhanced uploader" 
    22672267msgstr "" 
    22682268 

  • locales/ru/main.po

    r759 r1039  
    23032303msgstr "Ссылка на запись" 
    23042304 
    2305 msgid "Activate enhanced uploader" 
     2305msgid "Temporarily activate enhanced uploader" 
    23062306msgstr "Активировать улучшенный аплоадер" 
    23072307 
    2308 msgid "Disable enhanced uploader" 
     2308msgid "Temporarily disable enhanced uploader" 
    23092309msgstr "Отключить улучшенный аплоадер" 
    23102310 

  • locales/sr/main.po

    r759 r1039  
    23452345msgstr "Lien vers un billet" 
    23462346 
    2347 msgid "Activate enhanced uploader" 
    2348 msgstr "Activer l'interface avancée" 
    2349  
    2350 #, fuzzy 
    2351 msgid "Disable enhanced uploader" 
    2352 msgstr "Activer l'interface avancée" 
     2347msgid "Temporarily activate enhanced uploader" 
     2348msgstr "Activer temporairement l'interface avancée" 
     2349 
     2350#, fuzzy 
     2351msgid "Temporarily disable enhanced uploader" 
     2352msgstr "Désactiver temporairement l'interface avancée" 
    23532353 
    23542354msgid "File successfully uploaded." 

  • locales/sv/main.po

    r751 r1039  
    22502250msgstr "" 
    22512251 
    2252 msgid "Activate enhanced uploader" 
    2253 msgstr "" 
    2254  
    2255 msgid "Disable enhanced uploader" 
     2252msgid "Temporarily activate enhanced uploader" 
     2253msgstr "" 
     2254 
     2255msgid "Temporarily disable enhanced uploader" 
    22562256msgstr "" 
    22572257 

  • locales/te/main.po

    r759 r1039  
    23292329msgstr "ఓ టపాకి లింకు వేయండి" 
    23302330 
    2331 msgid "Activate enhanced uploader" 
    2332 msgstr "" 
    2333  
    2334 msgid "Disable enhanced uploader" 
     2331msgid "Temporarily activate enhanced uploader" 
     2332msgstr "" 
     2333 
     2334msgid "Temporarily disable enhanced uploader" 
    23352335msgstr "" 
    23362336 

  • locales/tr/main.po

    r759 r1039  
    23062306msgstr "Bir yazıya bağlantı" 
    23072307 
    2308 msgid "Activate enhanced uploader" 
     2308msgid "Temporarily activate enhanced uploader" 
    23092309msgstr "Gelişmiş yükleyiciyi etkinleştir" 
    23102310 
    2311 msgid "Disable enhanced uploader" 
     2311msgid "Temporarily disable enhanced uploader" 
    23122312msgstr "Gelişmiş yükleyiciyi kapat" 
    23132313 

  • locales/zh-cn/main.po

    r759 r1039  
    23092309msgstr "链接到一篇文章" 
    23102310 
    2311 msgid "Activate enhanced uploader" 
     2311msgid "Temporarily activate enhanced uploader" 
    23122312msgstr "激活增强的上传工具" 
    23132313 
    2314 msgid "Disable enhanced uploader" 
     2314msgid "Temporarily disable enhanced uploader" 
    23152315msgstr "禁用增强的上传工具" 
    23162316 
Note: See TracChangeset for help on using the changeset viewer.

Sites map