diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index e2c8eb530..df0a50afd 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -6,6 +6,7 @@ - Added version tag modes: multiple tags per user, single tag per user, site wide version tag and auto commit (thanks to Long Term Results B.V.) - fixed #9076: Thingy broken in latest beta, Save and Close buttons missing from Add/Edit Field dialogs (SDH Consulting Group). + - fixed #4214: Missing i18n in asset manager 7.6.3 - improved performance of file uploads diff --git a/lib/WebGUI/International.pm b/lib/WebGUI/International.pm index 678a737b1..50be7481f 100644 --- a/lib/WebGUI/International.pm +++ b/lib/WebGUI/International.pm @@ -86,7 +86,7 @@ A string that specifies the language that the user should see. Defaults to the =cut -my $safeRe = qr/[^\.:\w\d\s\/\^\;\?%]/; +my $safeRe = qr/[^\.:\w\d\s\/\^\;\?%><]/; sub get { my ($self, $id, $namespace, $language) = @_; diff --git a/lib/WebGUI/i18n/English/WebGUI.pm b/lib/WebGUI/i18n/English/WebGUI.pm index 54a97e427..a4fd7e8fe 100755 --- a/lib/WebGUI/i18n/English/WebGUI.pm +++ b/lib/WebGUI/i18n/English/WebGUI.pm @@ -4199,6 +4199,18 @@ Users may override this setting in their profile. context => q{Entry for version tag settings}, }, + '< prev' => { + message => q{< prev}, + lastUpdated => 1226704984, + context => q{i18n label for YUI paginator}, + }, + + 'next >' => { + message => q{next >}, + lastUpdated => 1226704984, + context => q{i18n label for YUI paginator}, + }, + }; 1; diff --git a/t/Asset/Snippet.t b/t/Asset/Snippet.t index 6a6104fa4..e465ff9b5 100644 --- a/t/Asset/Snippet.t +++ b/t/Asset/Snippet.t @@ -37,8 +37,6 @@ my $properties = { }; $snippet->update($properties); -use Data::Dumper; -Dumper($properties); foreach my $property (keys %{$properties}) { is ($snippet->get($property), $properties->{$property}, "updated $property is ".$properties->{$property}); } diff --git a/www/extras/yui-webgui/build/assetManager/assetManager.js b/www/extras/yui-webgui/build/assetManager/assetManager.js index ba1d2d766..f63ca4a18 100644 --- a/www/extras/yui-webgui/build/assetManager/assetManager.js +++ b/www/extras/yui-webgui/build/assetManager/assetManager.js @@ -215,7 +215,11 @@ WebGUI.AssetManager.initManager = function (o) { namespaces : { 'Asset' : [ "edit", - "More", + "More" + ], + 'WebGUI' : [ + "< prev", + "next >" ] }, onpreload : { @@ -230,10 +234,14 @@ WebGUI.AssetManager.initManager = function (o) { */ WebGUI.AssetManager.initDataTable = function (o) { var assetPaginator = new YAHOO.widget.Paginator({ - containers : ['pagination'], - pageLinks : 7, - rowsPerPage : 100, - template : "{CurrentPageReport} {PreviousPageLink} {PageLinks} {NextPageLink}" + containers : ['pagination'], + pageLinks : 7, + rowsPerPage : 100, + previousPageLinkLabel : WebGUI.AssetManager.i18n.get('WebGUI', '< prev'), + nextPageLinkLabel : WebGUI.AssetManager.i18n.get('WebGUI', 'next >'), +// previousPageLinkLabel : 'fred', +// nextPageLinkLabel : 'barney', + template : "{CurrentPageReport} {PreviousPageLink} {PageLinks} {NextPageLink}" });