[prev in list] [next in list] [prev in thread] [next in thread]
List: bricolage-commits
Subject: [6101] Partial fix for Bug # 905.
From: theory () bricolage ! cc
Date: 2004-12-16 19:11:13
Message-ID: 20041216191113.1255.qmail () x1 ! develooper ! com
[Download RAW message or body]
Revision: 6101
Author: theory
Date: 2004-12-16 11:11:11 -0800 (Thu, 16 Dec 2004)
ViewCVS: http://viewsvn.bricolage.cc/?rev=6101&view=rev
Log Message:
-----------
Partial fix for Bug # 905. Add slug to the unique URI error message.
Bugzilla Links:
--------------
http://bugs.bricolage.cc/show_bug.cgi?id=905
Modified Files:
--------------
bricolage/branches/rev_1_8/lib/Bric/Biz/Asset/Business.pm
bricolage/branches/rev_1_8/lib/Bric/Changes.pod
bricolage/branches/rev_1_8/lib/Bric/Util/Language/de_de.pm
bricolage/branches/rev_1_8/lib/Bric/Util/Language/it_it.pm
bricolage/branches/rev_1_8/lib/Bric/Util/Language/pt_pt.pm
bricolage/branches/rev_1_8/lib/Bric/Util/Language/ru_ru.pm
bricolage/branches/rev_1_8/lib/Bric/Util/Language/zh_cn.pm
bricolage/branches/rev_1_8/lib/Bric/Util/Language/zh_tw.pm
["r6101-theory.diff" (r6101-theory.diff)]
Modified: bricolage/branches/rev_1_8/lib/Bric/Biz/Asset/Business.pm
===================================================================
--- bricolage/branches/rev_1_8/lib/Bric/Biz/Asset/Business.pm 2004-12-15 18:27:42 UTC \
(rev 6100)
+++ bricolage/branches/rev_1_8/lib/Bric/Biz/Asset/Business.pm 2004-12-16 19:11:11 UTC \
(rev 6101) @@ -2598,7 +2598,7 @@
/Cannot insert a duplicate key into unique index \
udx_$key\_uri__site_id__uri/; my $things = $key eq 'media'
? 'category, or file name'
- : 'or categories';
+ : 'slug, or categories';
throw_not_unique
error => "The URI '$uri' is not unique.",
maketext => ['The URI "[_1]" is not unique. Please change the' .
Modified: bricolage/branches/rev_1_8/lib/Bric/Changes.pod
===================================================================
--- bricolage/branches/rev_1_8/lib/Bric/Changes.pod 2004-12-15 18:27:42 UTC (rev \
6100)
+++ bricolage/branches/rev_1_8/lib/Bric/Changes.pod 2004-12-16 19:11:11 UTC (rev \
6101) @@ -61,6 +61,11 @@
Fixed a bug where nothing would ever publish if you had PUBLISH_RELATED_ASSETS
enabled in bricolage.conf. [Mark]
+=item *
+
+Added "slug" to the list of attributes specified in the error message for a
+non-unique URI in a story. Thanks to Rachel Murray for the spot! [David]
+
=back
=head1 VERSION 1.8.3 (2004-11-09)
@@ -260,8 +265,9 @@
=item *
-Running C<make upgrade> with PostgreSQL "ident sameuser" security now works
-properly. [Keith Grennan]
+By forcing the upgrade scripts to execute as the PostgreSQL user, running
+C<make upgrade> with PostgreSQL "ident sameuser" security now works properly.
+[Keith Grennan]
=item *
Modified: bricolage/branches/rev_1_8/lib/Bric/Util/Language/de_de.pm
===================================================================
--- bricolage/branches/rev_1_8/lib/Bric/Util/Language/de_de.pm 2004-12-15 18:27:42 \
UTC (rev 6100)
+++ bricolage/branches/rev_1_8/lib/Bric/Util/Language/de_de.pm 2004-12-16 19:11:11 \
UTC (rev 6101) @@ -717,6 +717,7 @@
To Translate:
+ 'The URI "[_1]" is not unique. Please change the cover date, output channels, \
slug, or categories as necessary to make the URIs unique.' => 'The URI "[_1]" is not \
unique. Please change the cover date, output channels, slug, or categories as \
necessary to make the URIs unique.' 'You do not have permission to override user \
"[_1]"' => 'You do not have permission to override user "[_1]"', 'Template "[_1]" \
deployed.' => 'Vorlage "[_1]" ausgebracht', 'Story "[_1]" scheduled for \
publication.' => 'Beitrag "[_1]" veröffentlicht.',
Modified: bricolage/branches/rev_1_8/lib/Bric/Util/Language/it_it.pm
===================================================================
--- bricolage/branches/rev_1_8/lib/Bric/Util/Language/it_it.pm 2004-12-15 18:27:42 \
UTC (rev 6100)
+++ bricolage/branches/rev_1_8/lib/Bric/Util/Language/it_it.pm 2004-12-16 19:11:11 \
UTC (rev 6101) @@ -544,6 +544,7 @@
'Cannot make a dissociated category the primary category.' => 'Cannot make a \
dissociated category the primary category.' 'Related [_1] "[_2]" is not activate. \
Please relate another [_1].' => 'Related [_1] "[_2]" is not activate. Please relate \
another [_1].' 'Cannot auto-publish related $rel_disp_name "[_1]" because it is not \
on a publish desk.' => 'Cannot auto-publish related $rel_disp_name "[_1]" because it \
is not on a publish desk.' + 'The URI "[_1]" is not unique. Please change the cover \
date, output channels, slug, or categories as necessary to make the URIs unique.' => \
'The URI "[_1]" is not unique. Please change the cover date, output channels, slug, \
or categories as necessary to make the URIs unique.'
=end comment
Modified: bricolage/branches/rev_1_8/lib/Bric/Util/Language/pt_pt.pm
===================================================================
--- bricolage/branches/rev_1_8/lib/Bric/Util/Language/pt_pt.pm 2004-12-15 18:27:42 \
UTC (rev 6100)
+++ bricolage/branches/rev_1_8/lib/Bric/Util/Language/pt_pt.pm 2004-12-16 19:11:11 \
UTC (rev 6101) @@ -718,6 +718,7 @@
'Cannot make a dissociated category the primary category.' => 'Cannot make a \
dissociated category the primary category.' 'Related [_1] "[_2]" is not activate. \
Please relate another [_1].' => 'Related [_1] "[_2]" is not activate. Please relate \
another [_1].' 'Cannot auto-publish related $rel_disp_name "[_1]" because it is not \
on a publish desk.' => 'Cannot auto-publish related $rel_disp_name "[_1]" because it \
is not on a publish desk.' + 'The URI "[_1]" is not unique. Please change the cover \
date, output channels, slug, or categories as necessary to make the URIs unique.' => \
'The URI "[_1]" is not unique. Please change the cover date, output channels, slug, \
or categories as necessary to make the URIs unique.'
=end comment
Modified: bricolage/branches/rev_1_8/lib/Bric/Util/Language/ru_ru.pm
===================================================================
--- bricolage/branches/rev_1_8/lib/Bric/Util/Language/ru_ru.pm 2004-12-15 18:27:42 \
UTC (rev 6100)
+++ bricolage/branches/rev_1_8/lib/Bric/Util/Language/ru_ru.pm 2004-12-16 19:11:11 \
UTC (rev 6101) @@ -693,15 +693,6 @@
'[quant,_1,media,media] published.' => '[quant,_1,media,media] \
опубликован', '[quant,_1,story,stories] published.' => \
'[quant,_1,story,stories] опубликован', 'contains illegal characters!' => \
'содержит недопустимые символы!',
- '_AUTO' => 1,
-);
-
-
-=begin comment
-
-To translate:
-
- 'Slug required for non-fixed (non-cover) story type.' => 'Slug required for \
non-fixed (non-cover) story type.', 'Element must be associated with at least one \
site and one output channel.' => 'Элемент должен быть связан \
не менее, чем с одним Сайтом (site) и одним \
Каналом вывода (output channel).', 'Permission to manage "[_1]" group \
membership denied' => 'Нет разрешения для управления \
членством в группе "[_1]"', 'Permission to grant permission "[_1]" \
to group "[_2]" denied' => 'Нет разрешения для \
предоставления прав "[_1]" для группы "[_2]"', @@ -710,11 \
+701,21 @@ 'First Published' => 'Впервые опубликовано',
'You do not have permission to add "[_1]" objects' => 'У вас нет прав \
добавлять "[_1]" объектов', 'Remaining' => 'Осталось',
- '[_1] Site [_2] Permissions' => '[_1] Site [_2] Permissions', # Site Category \
Permissions 'Object Groups' => 'Группы объектов',
'[_1] Site Categories' => '[_1] Категории сайта',
'You do not have permission to override user "[_1]"' => 'У вас нет прав \
обходить пользователя "[_1]"' + '_AUTO' => 1,
+);
+
+=begin comment
+
+To translate:
+
+ 'Slug required for non-fixed (non-cover) story type.' => 'Slug required for \
non-fixed (non-cover) story type.', + '[_1] Site [_2] Permissions' => '[_1] Site \
[_2] Permissions', # Site Category Permissions + 'The URI "[_1]" is not unique. \
Please change the cover date, output channels, slug, or categories as necessary to \
make the URIs unique.' => 'The URI "[_1]" is not unique. Please change the cover \
date, output channels, slug, or categories as necessary to make the URIs unique.' +
=end comment
=cut
Modified: bricolage/branches/rev_1_8/lib/Bric/Util/Language/zh_cn.pm
===================================================================
--- bricolage/branches/rev_1_8/lib/Bric/Util/Language/zh_cn.pm 2004-12-15 18:27:42 \
UTC (rev 6100)
+++ bricolage/branches/rev_1_8/lib/Bric/Util/Language/zh_cn.pm 2004-12-16 19:11:11 \
UTC (rev 6101) @@ -571,6 +571,7 @@
'Cannot make a dissociated category the primary category.' => 'Cannot make a \
dissociated category the primary category.' 'Related [_1] "[_2]" is not activate. \
Please relate another [_1].' => 'Related [_1] "[_2]" is not activate. Please relate \
another [_1].' 'Cannot auto-publish related $rel_disp_name "[_1]" because it is not \
on a publish desk.' => 'Cannot auto-publish related $rel_disp_name "[_1]" because it \
is not on a publish desk.' + 'The URI "[_1]" is not unique. Please change the cover \
date, output channels, slug, or categories as necessary to make the URIs unique.' => \
'The URI "[_1]" is not unique. Please change the cover date, output channels, slug, \
or categories as necessary to make the URIs unique.'
=end comment
Modified: bricolage/branches/rev_1_8/lib/Bric/Util/Language/zh_tw.pm
===================================================================
--- bricolage/branches/rev_1_8/lib/Bric/Util/Language/zh_tw.pm 2004-12-15 18:27:42 \
UTC (rev 6100)
+++ bricolage/branches/rev_1_8/lib/Bric/Util/Language/zh_tw.pm 2004-12-16 19:11:11 \
UTC (rev 6101) @@ -707,6 +707,7 @@
'Cannot make a dissociated category the primary category.' => 'Cannot make a \
dissociated category the primary category.' 'Related [_1] "[_2]" is not activate. \
Please relate another [_1].' => 'Related [_1] "[_2]" is not activate. Please relate \
another [_1].' 'Cannot auto-publish related $rel_disp_name "[_1]" because it is not \
on a publish desk.' => 'Cannot auto-publish related $rel_disp_name "[_1]" because it \
is not on a publish desk.' + 'The URI "[_1]" is not unique. Please change the cover \
date, output channels, slug, or categories as necessary to make the URIs unique.' => \
'The URI "[_1]" is not unique. Please change the cover date, output channels, slug, \
or categories as necessary to make the URIs unique.'
Notice:
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic