Merge branch 'master' of git://github.com/gallery/gallery3

1 files changed, 18 insertions, 2 deletions

diff --git a/modules/g2_import/views/admin_g2_import.html.php b/modules/g2_import/views/admin_g2_import.html.php
index 9a5e3f05..0875e7f7 100644
--- a/modules/g2_import/views/admin_g2_import.html.php
+++ b/modules/g2_import/views/admin_g2_import.html.php
@@ -16,16 +16,17 @@
           <?= t("Permissions are <b>not imported</b>.  You will have to set them again manually (for now).") ?>
         </li>
         <li>
-          <?= t("The only supported image formats are JPG, PNG and GIF.  Other formats will be skipped.") ?>
+          <?= t("The only supported file formats are JPG, PNG and GIF, FLV and MP4.  Other formats will be skipped.") ?>
         </li>
         <li>
-          <?= t("The only supported movie formats are FLV and MP4.  Other formats will be skipped.") ?>
+          <?= t("Deactivating the <b>notification</b>, <b>search</b> and <b>exif</b> modules during your import will make it go faster.") ?>
         </li>
         <li>
           <?= t("The eAccelerator PHP performance extension is known to cause issues.  If you're using eAccelerator and having problems, please disable it while you do your import.  One way to do that is to put <code>php_value eaccelerator.enable 0</code> in gallery3/.htaccess") ?>
         </li>
       </ul>
     </div>
+
     <?= $form ?>
 
     <? if (g2_import::is_initialized()): ?>
@@ -91,6 +92,21 @@
         </a>
       </p>
     </div>
+
+    <div>
+      <h2> <?= t("Migrating from Gallery 2") ?> </h2>
+      <p>
+        <?= t("Once your migration is complete, put this block at the top of your gallery2/.htaccess file and all Gallery 2 urls will be redirected to Gallery 3") ?>
+      </p>
+
+      <code>
+        &lt;IfModule mod_rewrite.c&gt;<br/>
+          RewriteEngine On<br/>
+          RewriteBase <?= html::clean(g2_import::$g2_base_url) ?><br/>
+          RewriteRule ^(.*)$ <?= url::site("g2/map?path=\$1") ?>   [QSA,L]<br/>
+        &lt;/IfModule&gt;<br/>
+      </code>
+    </div>
     <? endif ?>
   </div>
 </div>