Fixing my mistakes in "upgrade_6.6.1-6.6.2.sql" and removing my updateTranslations.pl utility.
This commit is contained in:
Daniel Collis-Puro
parent
16c5b4e8ee
commit
ccb0ea63e5
3 changed files with 2 additions and 128 deletions
|
|
@ -1,6 +1,4 @@
|
|||
insert into webguiVersion values ('6.6.2','upgrade',unix_timestamp());
|
||||
alter table Shortcut add disableContentLock int(11) NOT NULL default '0';
|
||||
alter table SyndicatedContent add column displayMode varchar(20) not null default 'interleaved';
|
||||
alter table SyndicatedContent add column hasTerms varchar(255) not null;
|
||||
update template set template='<a name="<tmpl_var assetId>"></a><tmpl_if session.var.adminOn><p><tmpl_var controls></p></tmpl_if><style>.productFeatureHeader,.productSpecificationHeader,.productRelatedHeader,.productAccessoryHeader, .productBenefitHeader { font-weight: bold; font-size: 15px;}.productFeature,.productSpecification,.productRelated,.productAccessory, .productBenefit { font-size: 12px;}.productAttributeSeperator { background-color: black;}</style><tmpl_if displayTitle> <h1><tmpl_var title></h1></tmpl_if><table width="100%" cellpadding="3" cellspacing="0" border="0"><tr> <td class="content" valign="top"><tmpl_if description> <tmpl_var description><p /></tmpl_if><tmpl_if price> <b>Price:</b> <tmpl_var price><br /></tmpl_if><tmpl_if productnumber> <b>Product Number:</b> <tmpl_var productNumber><br /></tmpl_if><br><tmpl_if brochure.url> <a href="<tmpl_var brochure.url>"><img src="<tmpl_var brochure.icon>" border=0 align="absmiddle"><tmpl_var brochure.label></a><br /></tmpl_if><tmpl_if manual.url> <a href="<tmpl_var manual.url>"><img src="<tmpl_var manual.icon>" border=0 align="absmiddle"><tmpl_var manual.label></a><br /></tmpl_if><tmpl_if warranty.url> <a href="<tmpl_var warranty.url>"><img src="<tmpl_var warranty.icon>" border=0 align="absmiddle"><tmpl_var warranty.label></a><br /></tmpl_if> </td><td valign="top"><tmpl_if thumbnail1> <a href="<tmpl_var image1>"><img src="<tmpl_var thumbnail1>" border="0" /></a><p /></tmpl_if><tmpl_if thumbnail2> <a href="<tmpl_var image2>"><img src="<tmpl_var thumbnail2>" border="0" /></a><p /></tmpl_if><tmpl_if thumbnail3> <a href="<tmpl_var image3>"><img src="<tmpl_var thumbnail3>" border="0" /></a><p /></tmpl_if> </td></tr></table><table border="0" cellpadding="0" cellspacing="5"><tr><td valign="top" class="productFeature"><div class="productFeatureHeader">Features</div><tmpl_if session.var.adminOn> <a href="<tmpl_var addfeature.url>"><tmpl_var addfeature.label></a><p /></tmpl_if><tmpl_loop feature_loop> <tmpl_if session.var.adminOn><tmpl_var feature.controls></tmpl_if><tmpl_var feature.feature><br /></tmpl_loop><p/></td> <td class="productAttributeSeperator"><img src="^Extras;spacer.gif" width="1" height="1"></td> <td valign="top" class="productBenefit"><div class="productBenefitHeader">Benefits</div><tmpl_if session.var.adminOn> <a href="<tmpl_var addBenefit.url>"><tmpl_var addBenefit.label></a><p /></tmpl_if><tmpl_loop benefit_loop> <tmpl_if session.var.adminOn><tmpl_var benefit.controls></tmpl_if><tmpl_var benefit.benefit><br /></tmpl_loop><p/></td> <td class="productAttributeSeperator"><img src="^Extras;spacer.gif" width="1" height="1"></td> <td valign="top" class="productSpecification"><div class="productSpecificationHeader">Specifications</div><tmpl_if session.var.adminOn> <a href="<tmpl_var addSpecification.url>"><tmpl_var addSpecification.label></a><p /></tmpl_if><tmpl_loop specification_loop> <tmpl_if session.var.adminOn><tmpl_var specification.controls></tmpl_if><b><tmpl_var specification.label>:</b> <tmpl_var specification.specification> <tmpl_var specification.units><br /></tmpl_loop><p/></td> <td class="productAttributeSeperator"><img src="^Extras;spacer.gif" width="1" height="1"></td> <td valign="top" class="productAccessory"><div class="productAccessoryHeader">Accessories</div><tmpl_if session.var.adminOn> <a href="<tmpl_var addaccessory.url>"><tmpl_var addaccessory.label></a><p /></tmpl_if><tmpl_loop accessory_loop> <tmpl_if session.var.adminOn><tmpl_var accessory.controls></tmpl_if><a href="<tmpl_var accessory.url>"><tmpl_var accessory.title></a><br /></tmpl_loop><p/></td> <td class="productAttributeSeperator"><img src="^Extras;spacer.gif" width="1" height="1"></td> <td valign="top" class="productRelated"><div class="productRelatedHeader">Related Products</div><tmpl_if session.var.adminOn> <a href="<tmpl_var addRelatedProduct.url>"><tmpl_var addRelatedProduct.label></a><p /></tmpl_if><tmpl_loop relatedproduct_loop> <tmpl_if session.var.adminOn><tmpl_var RelatedProduct.controls></tmpl_if><a href="<tmpl_var relatedproduct.url>"><tmpl_var relatedproduct.title></a><br /></tmpl_loop></td></tr></table>' where assetId='PBtmpl0000000000000056';
|
||||
update template set template='^StyleSheet(^Extras;/adminConsole/adminConsole.css);\r\n^JavaScript(^Extras;/adminConsole/adminConsole.js);\r\n\r\n<div id=\"application_help\">\r\n <tmpl_if help.url>\r\n <a href=\"<tmpl_var help.url>\" target=\"_blank\"><img src=\"^Extras;/adminConsole/small/help.gif\" alt=\"?\" border=\"0\" /></a>\r\n </tmpl_if>\r\n</div>\r\n<div id=\"application_icon\">\r\n <img src=\"<tmpl_var application.icon>\" border=\"0\" title=\"<tmpl_var application.title>\" alt=\"<tmpl_var application.title>\" />\r\n</div>\r\n<div class=\"adminConsoleTitleIconMedalian\">\r\n<img src=\"^Extras;/adminConsole/medalian.gif\" border=\"0\" alt=\"*\" />\r\n</div>\r\n<div id=\"console_icon\">\r\n <img src=\"<tmpl_var console.icon>\" border=\"0\" title=\"<tmpl_var console.title>\" alt=\"<tmpl_var console.title>\" />\r\n</div>\r\n<div id=\"application_title\">\r\n <tmpl_var application.title>\r\n</div>\r\n<div id=\"console_title\">\r\n <tmpl_var console.title>\r\n</div>\r\n<div id=\"application_workarea\">\r\n <tmpl_var application.workArea>\r\n</div>\r\n<div id=\"console_workarea\">\r\n <div class=\"adminConsoleSpacer\">\r\n \r\n </div>\r\n <tmpl_loop application_loop>\r\n <tmpl_if canUse>\r\n <div class=\"adminConsoleApplication\">\r\n <a href=\"<tmpl_var url>\"><img src=\"<tmpl_var icon>\" border=\"0\" title=\"<tmpl_var title>\" alt=\"<tmpl_var title>\" /></a><br />\r\n <a href=\"<tmpl_var url>\"><tmpl_var title></a>\r\n </div>\r\n </tmpl_if>\r\n </tmpl_loop>\r\n <div class=\"adminConsoleSpacer\">\r\n \r\n </div>\r\n</div>\r\n<div class=\"adminConsoleMenu\">\r\n <div id=\"adminConsoleMainMenu\" class=\"adminConsoleMainMenu\">\r\n <div id=\"console_toggle_on\">\r\n <a href=\"#\" onClick=\"toggleAdminConsole()\"><tmpl_var toggle.on.label></a><br />\r\n </div>\r\n <div id=\"console_toggle_off\">\r\n <a href=\"#\" onClick=\"toggleAdminConsole()\"><tmpl_var toggle.off.label></a><br />\r\n </div>\r\n </div>\r\n <div id=\"adminConsoleApplicationSubmenu\" class=\"adminConsoleApplicationSubmenu\">\r\n <tmpl_loop submenu_loop>\r\n <a href=\"<tmpl_var url>\" <tmpl_var extras>><tmpl_var label></a><br />\r\n </tmpl_loop>\r\n </div>\r\n <div id=\"adminConsoleUtilityMenu\" class=\"adminConsoleUtilityMenu\">\r\n <a href=\"<tmpl_var backtosite.url>\"><tmpl_var backtosite.label></a><br />\r\n ^AdminToggle;<br />\r\n ^LoginToggle;<br />\r\n </div>\r\n</div>\r\n<script lang=\"JavaScript\">\r\n initAdminConsole(<tmpl_if application.title>true<tmpl_else>false</tmpl_if>,<tmpl_if submenu_loop>true<tmpl_else>false</tmpl_if>);\r\n</script>\r\n' where assetId='PBtmpl0000000000000001';
|
||||
|
|
|
|||
|
|
@ -1,2 +1,4 @@
|
|||
insert into webguiVersion values ('6.7.0','upgrade',unix_timestamp());
|
||||
alter table SyndicatedContent add column displayMode varchar(20) not null default 'interleaved';
|
||||
alter table SyndicatedContent add column hasTerms varchar(255) not null;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,126 +0,0 @@
|
|||
#!/usr/bin/perl
|
||||
|
||||
use strict;
|
||||
use warnings;
|
||||
use Data::Dumper;
|
||||
use Getopt::Long;
|
||||
|
||||
our $webguiRoot;
|
||||
|
||||
BEGIN {
|
||||
$webguiRoot = "..";
|
||||
unshift (@INC, $webguiRoot."/lib");
|
||||
}
|
||||
|
||||
my $language='English';
|
||||
my $namespace;
|
||||
my $help;
|
||||
my $test;
|
||||
|
||||
GetOptions(
|
||||
'language=s'=>\$language,
|
||||
'namespace=s'=>\$namespace,
|
||||
'help'=>\$help,
|
||||
'test'=>\$test
|
||||
);
|
||||
|
||||
if ((!$help && !$namespace) or $help){
|
||||
print <<STOP;
|
||||
|
||||
Usage: perl $0
|
||||
|
||||
This script helps you add keys and entries to the appropriate
|
||||
WebGUI/i18n/<Language>/ translation files. It sorts the entries
|
||||
by key value and takes care of escaping automatically.
|
||||
|
||||
Options:
|
||||
|
||||
--language The language you're adding an entry for.
|
||||
Defaults to English
|
||||
|
||||
--help Display this help message and exit.
|
||||
|
||||
--namespace The name of the file you want to manipulate
|
||||
in "lib/WebGUI/i18n/<language>" WITHOUT the .pm
|
||||
extension. So, if you're editing the "Macro_GroupAdd.pm"
|
||||
file, it's "Macro_GroupAdd".
|
||||
|
||||
--test Don't edit the actual file, but create a copy with ".test"
|
||||
appended to the name.
|
||||
|
||||
STOP
|
||||
exit;
|
||||
}
|
||||
|
||||
die('You need to give us a namespace to edit') if (!$namespace);
|
||||
|
||||
my $tranmodule=join('::',('WebGUI','i18n',$language,$namespace));
|
||||
eval "use $tranmodule;";
|
||||
|
||||
if (($@)) {
|
||||
die('Either that namespace does not exist or you spelled it incorrectly. Please try again');
|
||||
}
|
||||
|
||||
my $variable='$'.$tranmodule.'::I18N';
|
||||
my $i18n=eval "$variable";
|
||||
|
||||
print "\nEnter a new key value to create a new entry.\nCurrent Keys:\n\n";
|
||||
foreach ((keys %$i18n)) {
|
||||
print "$_\n";
|
||||
}
|
||||
|
||||
my $key='';
|
||||
while (lc($key) ne 'quit') {
|
||||
print "\n\nNew Key, or quit to stop:\n";
|
||||
$key=<STDIN>;
|
||||
chomp($key);
|
||||
next if(!$key);
|
||||
last if(lc($key) eq 'quit');
|
||||
if (! defined $i18n->{$key}) {
|
||||
print "\nNew key. Ok?\n";
|
||||
my $input=<STDIN>;
|
||||
chomp($input);
|
||||
if (lc(substr($input,0,1)) eq 'y') {
|
||||
get_info($key,$i18n);
|
||||
}
|
||||
} else {
|
||||
print "\nErm. . . That key's already in use. Please try again.\n";
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
################################################################################
|
||||
sub save_file{
|
||||
open(OUTPUT,">","../lib/WebGUI/i18n/$language/$namespace.pm".(($test) ? '.test' : '')) or die($!);
|
||||
$Data::Dumper::Varname='I18N';
|
||||
$Data::Dumper::Sortkeys=1;
|
||||
|
||||
print OUTPUT "package $tranmodule;\n\n";
|
||||
my $output=Dumper($i18n);
|
||||
$output =~ s/^\$I18N1/\$I18N/i;
|
||||
print OUTPUT "our ".$output;
|
||||
print OUTPUT "1;";
|
||||
close OUTPUT;
|
||||
print "Saved!!\n";
|
||||
}
|
||||
########################################
|
||||
|
||||
|
||||
################################################################################
|
||||
sub get_info{
|
||||
my $key=shift;
|
||||
my $i18n=shift;
|
||||
print "\nEnter the new information for this key. Press Ctrl-D to save\n";
|
||||
my @info=<STDIN>;
|
||||
print "\n\nOk? \n";
|
||||
my $input=<STDIN>;
|
||||
chomp($input);
|
||||
if (lc(substr($input,0,1)) eq 'y') {
|
||||
my $string=join("",@info);
|
||||
chomp($string);
|
||||
$i18n->{$key}->{message}=$string;
|
||||
$i18n->{$key}->{lastUpdated}=time;
|
||||
save_file();
|
||||
}
|
||||
}
|
||||
########################################
|
||||
Loading…
Add table
Add a link
Reference in a new issue