Menu
▾
▴
Re: [Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[41213] branches/9.x
|
From: Marc L. <ma...@ma...> - 2012-04-30 18:37:36
|
Thanks for minify fix are branches/9.x/lang/en/language.js changes intentional? Thanks! On Mon, Apr 30, 2012 at 1:56 PM, <rob...@us...> wrote: > Revision: 41213 > http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=41213&view=rev > Author: robertplummer > Date: 2012-04-30 17:56:17 +0000 (Mon, 30 Apr 2012) > Log Message: > ----------- > [FIX] Minify was failing for tablesorter, use their min file as external which passes min fine; found a syntax issue > > Modified Paths: > -------------- > branches/9.x/lang/en/language.js > branches/9.x/tiki-setup.php > > Modified: branches/9.x/lang/en/language.js > =================================================================== > --- branches/9.x/lang/en/language.js 2012-04-30 16:54:21 UTC (rev 41212) > +++ branches/9.x/lang/en/language.js 2012-04-30 17:56:17 UTC (rev 41213) > @@ -7,56 +7,56 @@ > > lang = { > "Which Continent Do You Live In?" : "EN Dans quel continent habitez-vous ?", > - "Very Secure" : "EN Très sécurisé", > -// "Very Secure" : "Very Secure", > -// "Secure" : "Secure", > -// "Very Strong" : "Very Strong", > -// "Strong" : "Strong", > -// "Average" : "Average", > -// "Weak" : "Weak", > -// "Very Weak" : "Very Weak", > -// "Strength" : "Strength", > -// "Valid User Name" : "Valid User Name", > -// "Passwords match" : "Passwords match", > -// "Valid Email" : "Valid Email", > -// "Close" : "Close", > -// "Submit" : "Submit", > -// "Insert" : "Insert", > -// "Replace" : "Replace", > -// "Match" : "Match", > -// "Do not match" : "Do not match", > -// "Advanced options" : "Advanced options", > -// "Pick a file." : "Pick a file." > -// "Add Field" : "Add Field", > -// "Edit Field" : "Edit Field", > -// "Removing the field will result in data loss. Are you sure?" : "Removing the field will result in data loss. Are you sure?", > -// "Save" : "Save", > -// "Cancel" : "Cancel", > -// "Delete" : "Delete", > -// "Unassign module" : "Unassign module", > -// "Edit module" : "Edit module", > -// "Edit module:" : "Edit module:", > -// "Favorite" : "Favorite", > -// "What address are you looking for?" : "What address are you looking for?", > -// "Filter:" : "Filter:", > -// "Please enter a page name" : "Please enter a page name", > -// "Change Highlighter" : "Change Highlighter", > -// "Are you sure you want to unassign this module?" : "Are you sure you want to unassign this module?" > + "Very Secure" : "EN Très sécurisé"/*, > + "Very Secure" : "Very Secure", > + "Secure" : "Secure", > + "Very Strong" : "Very Strong", > + "Strong" : "Strong", > + "Average" : "Average", > + "Weak" : "Weak", > + "Very Weak" : "Very Weak", > + "Strength" : "Strength", > + "Valid User Name" : "Valid User Name", > + "Passwords match" : "Passwords match", > + "Valid Email" : "Valid Email", > + "Close" : "Close", > + "Submit" : "Submit", > + "Insert" : "Insert", > + "Replace" : "Replace", > + "Match" : "Match", > + "Do not match" : "Do not match", > + "Advanced options" : "Advanced options", > + "Pick a file." : "Pick a file." > + "Add Field" : "Add Field", > + "Edit Field" : "Edit Field", > + "Removing the field will result in data loss. Are you sure?" : "Removing the field will result in data loss. Are you sure?", > + "Save" : "Save", > + "Cancel" : "Cancel", > + "Delete" : "Delete", > + "Unassign module" : "Unassign module", > + "Edit module" : "Edit module", > + "Edit module:" : "Edit module:", > + "Favorite" : "Favorite", > + "What address are you looking for?" : "What address are you looking for?", > + "Filter:" : "Filter:", > + "Please enter a page name" : "Please enter a page name", > + "Change Highlighter" : "Change Highlighter", > + "Are you sure you want to unassign this module?" : "Are you sure you want to unassign this module?" > // remember the IE does not support ending comma on last item > -// "Add Field" : "Add Field", > -// "Edit Field" : "Edit Field", > -// "Removing the field will result in data loss. Are you sure?" : "Removing the field will result in data loss. Are you sure?", > -// "Save" : "Save", > -// "Cancel" : "Cancel", > -// "Delete" : "Delete", > -// "Unassign module" : "Unassign module", > -// "Edit module" : "Edit module", > -// "Edit module:" : "Edit module:", > -// "Favorite" : "Favorite", > -// "What address are you looking for?" : "What address are you looking for?", > -// "Filter:" : "Filter:", > -// "Please enter a page name" : "Please enter a page name", > -// "Change Highlighter" : "Change Highlighter", > -// "Are you sure you want to unassign this module?" : "Are you sure you want to unassign this module?" > - // remember the IE does not support ending comma on last item > + "Add Field" : "Add Field", > + "Edit Field" : "Edit Field", > + "Removing the field will result in data loss. Are you sure?" : "Removing the field will result in data loss. Are you sure?", > + "Save" : "Save", > + "Cancel" : "Cancel", > + "Delete" : "Delete", > + "Unassign module" : "Unassign module", > + "Edit module" : "Edit module", > + "Edit module:" : "Edit module:", > + "Favorite" : "Favorite", > + "What address are you looking for?" : "What address are you looking for?", > + "Filter:" : "Filter:", > + "Please enter a page name" : "Please enter a page name", > + "Change Highlighter" : "Change Highlighter", > + "Are you sure you want to unassign this module?" : "Are you sure you want to unassign this module?" > + // remember the IE does not support ending comma on last item*/ > }; > > Modified: branches/9.x/tiki-setup.php > =================================================================== > --- branches/9.x/tiki-setup.php 2012-04-30 16:54:21 UTC (rev 41212) > +++ branches/9.x/tiki-setup.php 2012-04-30 17:56:17 UTC (rev 41213) > @@ -335,8 +335,14 @@ > } > if ( $prefs['feature_jquery_tablesorter'] == 'y' ) { > $headerlib->add_cssfile('lib/jquery_tiki/tablesorter/themes/tiki/style.css'); > - $headerlib->add_jsfile('lib/jquery/tablesorter/jquery.tablesorter.js'); > - $headerlib->add_jsfile('lib/jquery/tablesorter/addons/pager/jquery.tablesorter.pager.js'); > + $headerlib->add_jsfile('lib/jquery/tablesorter/jquery.tablesorter.min.js'); > + > + if ( $prefs['tiki_minify_javascript'] === 'y' ) { > + //tablesorter has bad syntax in the non-min file, however the min file seems to work fine when double minned :) > + $headerlib->add_jsfile('lib/jquery/tablesorter/addons/pager/jquery.tablesorter.pager.min.js', 'external'); > + } else { > + $headerlib->add_jsfile('lib/jquery/tablesorter/addons/pager/jquery.tablesorter.pager.js'); > + } > } > if ( $prefs['feature_shadowbox'] == 'y' ) { > $headerlib->add_jsfile('lib/jquery/colorbox/jquery.colorbox.js'); > > This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. > > > ------------------------------------------------------------------------------ > Live Security Virtual Conference > Exclusive live event will cover all the ways today's security and > threat landscape has changed and how IT managers can respond. Discussions > will include endpoint security, mobile security and the latest in malware > threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ > _______________________________________________ > Tikiwiki-cvs mailing list > Tik...@li... > https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs -- Marc Laporte http://MarcLaporte.com http://Tiki.org/MarcLaporte http://AvanTech.net |