From: <an...@us...> - 2008-01-29 22:58:46
|
Revision: 17417 http://gallery.svn.sourceforge.net/gallery/?rev=17417&view=rev Author: andy_st Date: 2008-01-29 14:58:50 -0800 (Tue, 29 Jan 2008) Log Message: ----------- Fix for bug 1833431 - Rebrand publishxp with a Windows independent module name (pluginId cannot change). - New name is "Windows Publishing Wizard" - Added usage instructions for Windows Vista - Broke monolithic paragraph from XP instructions into a list of steps Modified Paths: -------------- trunk/gallery2/modules/publishxp/ItemAddPublishXp.inc trunk/gallery2/modules/publishxp/NewAlbum.inc trunk/gallery2/modules/publishxp/Options.inc trunk/gallery2/modules/publishxp/PublishXpLogin.inc trunk/gallery2/modules/publishxp/SelectAlbum.inc trunk/gallery2/modules/publishxp/UploadItems.inc trunk/gallery2/modules/publishxp/module.inc trunk/gallery2/modules/publishxp/po/strings.raw trunk/gallery2/modules/publishxp/templates/Head.tpl trunk/gallery2/modules/publishxp/templates/ItemAddPublishXp.tpl Modified: trunk/gallery2/modules/publishxp/ItemAddPublishXp.inc =================================================================== --- trunk/gallery2/modules/publishxp/ItemAddPublishXp.inc 2008-01-29 21:20:05 UTC (rev 17416) +++ trunk/gallery2/modules/publishxp/ItemAddPublishXp.inc 2008-01-29 22:58:50 UTC (rev 17417) @@ -52,7 +52,7 @@ if ($ret) { return array($ret, null); } - return array(null, $module->translate('Windows XP')); + return array(null, $module->translate('Windows Publishing Wizard')); } } ?> Modified: trunk/gallery2/modules/publishxp/NewAlbum.inc =================================================================== --- trunk/gallery2/modules/publishxp/NewAlbum.inc 2008-01-29 21:20:05 UTC (rev 17416) +++ trunk/gallery2/modules/publishxp/NewAlbum.inc 2008-01-29 22:58:50 UTC (rev 17417) @@ -161,7 +161,7 @@ return array($ret, null); } - $template->title($module->translate('Publish XP')); + $template->title($module->translate('Windows Publishing Wizard')); $template->setVariable('NewAlbum', $NewAlbum); $template->setVariable('controller', 'publishxp.NewAlbum'); $template->head('modules/publishxp/templates/Head.tpl'); Modified: trunk/gallery2/modules/publishxp/Options.inc =================================================================== --- trunk/gallery2/modules/publishxp/Options.inc 2008-01-29 21:20:05 UTC (rev 17416) +++ trunk/gallery2/modules/publishxp/Options.inc 2008-01-29 22:58:50 UTC (rev 17417) @@ -134,7 +134,7 @@ return array($ret, null); } - $template->title($module->translate('Publish XP')); + $template->title($module->translate('Windows Publishing Wizard')); $template->setVariable('Options', $Options); $template->head('modules/publishxp/templates/Head.tpl'); Modified: trunk/gallery2/modules/publishxp/PublishXpLogin.inc =================================================================== --- trunk/gallery2/modules/publishxp/PublishXpLogin.inc 2008-01-29 21:20:05 UTC (rev 17416) +++ trunk/gallery2/modules/publishxp/PublishXpLogin.inc 2008-01-29 22:58:50 UTC (rev 17417) @@ -124,7 +124,7 @@ return array($ret, null); } - $template->title($module->translate('Publish XP')); + $template->title($module->translate('Windows Publishing Wizard')); $template->setVariable('controller', 'publishxp.PublishXpLogin'); $template->head('modules/publishxp/templates/Head.tpl'); Modified: trunk/gallery2/modules/publishxp/SelectAlbum.inc =================================================================== --- trunk/gallery2/modules/publishxp/SelectAlbum.inc 2008-01-29 21:20:05 UTC (rev 17416) +++ trunk/gallery2/modules/publishxp/SelectAlbum.inc 2008-01-29 22:58:50 UTC (rev 17417) @@ -148,7 +148,7 @@ return array($ret, null); } - $template->title($module->translate('Publish XP')); + $template->title($module->translate('Windows Publishing Wizard')); $template->setVariable('SelectAlbum', $SelectAlbum); $template->setVariable('controller', 'publishxp.SelectAlbum'); $template->head('modules/publishxp/templates/Head.tpl'); Modified: trunk/gallery2/modules/publishxp/UploadItems.inc =================================================================== --- trunk/gallery2/modules/publishxp/UploadItems.inc 2008-01-29 21:20:05 UTC (rev 17416) +++ trunk/gallery2/modules/publishxp/UploadItems.inc 2008-01-29 22:58:50 UTC (rev 17417) @@ -284,7 +284,7 @@ return array($ret, null); } - $template->title($module->translate('Publish XP')); + $template->title($module->translate('Windows Publishing Wizard')); $template->setVariable('UploadItems', $UploadItems); $template->head('modules/publishxp/templates/Head.tpl'); Modified: trunk/gallery2/modules/publishxp/module.inc =================================================================== --- trunk/gallery2/modules/publishxp/module.inc 2008-01-29 21:20:05 UTC (rev 17416) +++ trunk/gallery2/modules/publishxp/module.inc 2008-01-29 22:58:50 UTC (rev 17417) @@ -34,9 +34,9 @@ function PublishXpModule() { global $gallery; $this->setId('publishxp'); - $this->setName($gallery->i18n('Publish XP')); - $this->setDescription($gallery->i18n('Publish photos to Gallery directly from Windows XP')); - $this->setVersion('1.0.11'); + $this->setName($gallery->i18n('Windows Publishing Wizard')); + $this->setDescription($gallery->i18n('Publish photos to Gallery directly from Windows')); + $this->setVersion('1.0.12'); $this->_templateVersion = 1; $this->setGroup('import', $gallery->i18n('Import')); $this->setCallbacks(''); Modified: trunk/gallery2/modules/publishxp/po/strings.raw =================================================================== --- trunk/gallery2/modules/publishxp/po/strings.raw 2008-01-29 21:20:05 UTC (rev 17416) +++ trunk/gallery2/modules/publishxp/po/strings.raw 2008-01-29 22:58:50 UTC (rev 17417) @@ -1,11 +1,10 @@ # $Id$ /* ItemAddPublishXp.inc */ -gettext("Windows XP") +gettext("Windows Publishing Wizard") /* also in: NewAlbum.inc Options.inc PublishXpLogin.inc SelectAlbum.inc UploadItems.inc module.inc */ /* module.inc */ -gettext("Publish XP") /* also in: templates/Head.tpl */ -gettext("Publish photos to Gallery directly from Windows XP") +gettext("Publish photos to Gallery directly from Windows") gettext("Import") /* templates/DownloadRegistryFile.tpl */ @@ -16,14 +15,23 @@ gettext("Upload to Gallery") /* templates/ItemAddPublishXp.tpl */ -gettext("Windows XP comes with a nice feature that allows you to publish content from your desktop directly to a web service. Follow the instructions below to enable this service on your Windows XP system.") -gettext("Step 1") +gettext("Microsoft Windows comes with a nice feature that allows you to publish content from your desktop directly to a web service. Follow the instructions below to enable this service on your Windows system.") +gettext("Installation") gettext("Download the configuration file using right-click 'Save Target As...' Once downloaded, rename it to 'install_registry.reg'. If it asks you for confirmation about changing the file type, answer 'yes'. Right click on this file and you should see a menu appear. Select the Merge option (this should be at the top of the menu). It will ask you if you want to import these values into your registry. Click 'Ok'. It will tell you that the files were imported successfully. Click 'Ok' again.") gettext("(for Windows Vista)") gettext("(for Windows XP, Windows 2000 and earlier Windows versions)") gettext("Download [install_registry.reg]") -gettext("Step 2") -gettext("Open your Windows Explorer and browse to a folder containing supported images. Select the image(s) or a folder and there should be a link on the left that says 'Publish this file to the web...' Click this link and then follow the instructions to log into your Gallery, select an album and publish the image.") +gettext("Windows Vista") +gettext("Open your %sWindows Photo Gallery%s.") +gettext("Select one or more images / files in your Windows Photo Gallery.") +gettext("Click \"Print...\" and select the online printing option (not the local printing option).") +gettext("Select the Gallery 2 printing service.") +gettext("Then follow the instructions to log into your Gallery, select an album and publish the image(s).") +gettext("Windows XP, Windows 2000 and earlier Windows versions") +gettext("Open your Windows Explorer and browse to a folder containing supported images.") +gettext("Select the image(s) or a folder.") +gettext("Click the link on the left that says \"Publish this file to the web...\"") +gettext("Usage") /* templates/NewAlbum.tpl */ gettext("Specify the name and title for the new album.") Modified: trunk/gallery2/modules/publishxp/templates/Head.tpl =================================================================== --- trunk/gallery2/modules/publishxp/templates/Head.tpl 2008-01-29 21:20:05 UTC (rev 17416) +++ trunk/gallery2/modules/publishxp/templates/Head.tpl 2008-01-29 22:58:50 UTC (rev 17417) @@ -10,7 +10,7 @@ {* * If you enable XpDebug, you get Back/Next buttons for all browsers, not - * just the XP Publishing Wizard. It's useful for debugging in a development + * just the Windows Publishing Wizard. It's useful for debugging in a development * environment, but should be disabled for production environments. *} {assign var=XpDebug value=false} Modified: trunk/gallery2/modules/publishxp/templates/ItemAddPublishXp.tpl =================================================================== --- trunk/gallery2/modules/publishxp/templates/ItemAddPublishXp.tpl 2008-01-29 21:20:05 UTC (rev 17416) +++ trunk/gallery2/modules/publishxp/templates/ItemAddPublishXp.tpl 2008-01-29 22:58:50 UTC (rev 17417) @@ -4,10 +4,12 @@ *} <div class="gbBlock"> <div class="giDescription"> - {g->text text="Windows XP comes with a nice feature that allows you to publish content from your desktop directly to a web service. Follow the instructions below to enable this service on your Windows XP system."} + <p> + {g->text text="Microsoft Windows comes with a nice feature that allows you to publish content from your desktop directly to a web service. Follow the instructions below to enable this service on your Windows system."} + </p> + <h3>{g->text text="Installation"}</h3> <p> - <b>{g->text text="Step 1"}</b><br/> {g->text text="Download the configuration file using right-click 'Save Target As...' Once downloaded, rename it to 'install_registry.reg'. If it asks you for confirmation about changing the file type, answer 'yes'. Right click on this file and you should see a menu appear. Select the Merge option (this should be at the top of the menu). It will ask you if you want to import these values into your registry. Click 'Ok'. It will tell you that the files were imported successfully. Click 'Ok' again."} </p> {capture assign=vistaCaption}{g->text text="(for Windows Vista)"}{/capture} @@ -39,9 +41,48 @@ </a> {$captionForAlternativeVersion} </li> </ul> - <p> - <b>{g->text text="Step 2"}</b><br/> - {g->text text="Open your Windows Explorer and browse to a folder containing supported images. Select the image(s) or a folder and there should be a link on the left that says 'Publish this file to the web...' Click this link and then follow the instructions to log into your Gallery, select an album and publish the image."} - </p> + + <br/> + {capture assign=instructionsVista} + <h4>{g->text text="Windows Vista"}</h4> + <ol> + <li>{g->text text="Open your %sWindows Photo Gallery%s." + arg1='<a href="http://en.wikipedia.org/wiki/Windows_Photo_Gallery">' + arg2="</a>"}</li> + <li>{g->text text="Select one or more images / files in your Windows Photo Gallery."}</li> + <li>{g->text text='Click "Print..." and select the online printing option (not the local printing option).'}</li> + <li>{g->text text="Select the Gallery 2 printing service."}</li> + <li>{g->text text="Then follow the instructions to log into your Gallery, select an album and publish the image(s)."}</li> + </ol> + {/capture} + {capture assign=instructionsOtherWindowsVersions} + <h4>{g->text text="Windows XP, Windows 2000 and earlier Windows versions"}</h4> + <ol> + <li>{g->text text="Open your Windows Explorer and browse to a folder containing supported images."}</li> + <li>{g->text text="Select the image(s) or a folder."}</li> + <li>{g->text text='Click the link on the left that says "Publish this file to the web..."'}</li> + <li>{g->text text="Select the Gallery 2 printing service."}</li> + <li>{g->text text="Then follow the instructions to log into your Gallery, select an album and publish the image(s)."}</li> + </ol> + {/capture} + {capture assign=instructionsForRecommendedVersion} + {if $ItemAddPublishXp.isUsingWindowsVista} + {$instructionsVista} + {else} + {$instructionsOtherWindowsVersions} + {/if} + {/capture} + {capture assign=instructionsForAlternativeVersion} + {if $ItemAddPublishXp.isUsingWindowsVista} + {$instructionsOtherWindowsVersions} + {else} + {$instructionsVista} + {/if} + {/capture} + <h3>{g->text text="Usage"}</h3> + {$instructionsForRecommendedVersion} + + {$instructionsForAlternativeVersion} + </div> </div> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |