From 174e7f29939627f67561d76f7e10a1b4085d705b Mon Sep 17 00:00:00 2001
From: vti <viacheslav.t@gmail.com>
Date: Sat, 30 Aug 2008 22:07:05 +0200
Subject: [PATCH] Messing with common i18n modules.

---
 lib/Blog/Controller/Post.pm                                    | 10 +++-------
 lib/Blog/RDBO/Comment.pm                                       |  2 ++
 lib/Blog/View/TT.pm                                            |  2 +-
 .../include/{available_languages => available_translations}    |  4 ++--
 templates/src/default/page/view.tt2                            |  2 +-
 templates/src/default/post/form.tt2                            |  8 ++++----
 templates/src/default/post/view.tt2                            |  2 +-
 7 files changed, 14 insertions(+), 16 deletions(-)
 rename templates/src/default/include/{available_languages => available_translations} (59%)

diff --git a/lib/Blog/Controller/Post.pm b/lib/Blog/Controller/Post.pm
index 7ef20ba..19c926b 100644
--- a/lib/Blog/Controller/Post.pm
+++ b/lib/Blog/Controller/Post.pm
@@ -26,9 +26,7 @@ sub view : Local Args(1) {
     my ( $self, $c, $id ) = @_;
 
     my $post = $c->model( 'Post' )->create( key => $id );
-    $post->load(
-        query => [ 't2.lang' => $c->language ],
-        with  => [ 'post_i18n' ],
+    $post->load( i18n => $c->language,
         speculative => 1
     );
 
@@ -36,7 +34,7 @@ sub view : Local Args(1) {
 
     $c->stash->{ post } = {
         $post->column_value_pairs,
-        available_languages => $post->available_languages,
+        available_translations => $post->available_translations,
         tags => [ $post->tags ]
     };
 }
@@ -66,9 +64,7 @@ sub edit : LocalRegex('^edit/(\d+)$') {
     my $id = $c->req->captures->[ 0 ];
 
     my $post = $c->model( 'Post' )->create( id => $id );
-    $post->load(
-        query       => [ 't2.lang' => $c->language ],
-        with        => [ 'post_i18n' ],
+    $post->load( i18n => $c->language,
         speculative => 1
     );
     $self->throw_not_found( $c ) if $post->not_found;
diff --git a/lib/Blog/RDBO/Comment.pm b/lib/Blog/RDBO/Comment.pm
index 4e52a8f..fb0d329 100644
--- a/lib/Blog/RDBO/Comment.pm
+++ b/lib/Blog/RDBO/Comment.pm
@@ -4,6 +4,8 @@ use strict;
 
 use base qw(Blog::DB::Object);
 
+use Rose::DB::Object::Helpers 'column_value_pairs';
+
 __PACKAGE__->meta->setup(
     table => 'comment',
 
diff --git a/lib/Blog/View/TT.pm b/lib/Blog/View/TT.pm
index ce1a9a0..7c62f02 100644
--- a/lib/Blog/View/TT.pm
+++ b/lib/Blog/View/TT.pm
@@ -96,7 +96,7 @@ sub ccode {
 sub cut {
     my ( $text, $maxlength ) = @_;
 
-    Blog->context->helper('Util')->cut( $text, $maxlength);
+    Blog->context->model('Util')->cut( $text, $maxlength);
 }
 
 =head1 AUTHOR
diff --git a/templates/src/default/include/available_languages b/templates/src/default/include/available_translations
similarity index 59%
rename from templates/src/default/include/available_languages
rename to templates/src/default/include/available_translations
index ef3e757..a099166 100644
--- a/templates/src/default/include/available_languages
+++ b/templates/src/default/include/available_translations
@@ -1,9 +1,9 @@
-[% FOREACH lang IN entry.available_languages %]
+[% FOREACH lang IN entry.available_translations %]
 <div class="av-transl">[% IF loop.first %][% c.loc('Available translations')
     %]:[% END %]
 
 <a href="[% base %]/[% lang
-    %]/[% c.req.path %]">[% c.helper('Util').lang2name(lang)%]</a> [% '|' UNLESS
+    %]/[% c.req.path %]">[% c.config.languages.$lang %]</a> [% '|' UNLESS
     loop.last %]
 
 [% IF loop.last %]
diff --git a/templates/src/default/page/view.tt2 b/templates/src/default/page/view.tt2
index f83205b..c991b67 100644
--- a/templates/src/default/page/view.tt2
+++ b/templates/src/default/page/view.tt2
@@ -1,7 +1,7 @@
 [% WRAPPER 'include/corners' %]
 <h2 class="title">[% page.title | html %][% translation(page) %]</h2>
 
-[% PROCESS 'include/available_languages' entry = page %]
+[%# PROCESS 'include/available_languages' entry = page %]
 
 <div class="bbcode-strict">
 [% TRY %]
diff --git a/templates/src/default/post/form.tt2 b/templates/src/default/post/form.tt2
index 766a951..49d073a 100644
--- a/templates/src/default/post/form.tt2
+++ b/templates/src/default/post/form.tt2
@@ -9,14 +9,14 @@
 [% form_start %]
 
 [% form_text(name='key',label=c.loc('Key'),required=1
-    ,value=post.key || c.model('Util').uuid()) %]
+    ,default=post.key || c.model('Util').uuid()) %]
 [% UNLESS g_action.match('edit'); form_languages(); END %]
 [% form_text(name='title',label=c.loc('Title'),required=1
-    ,value=post.title) %]
+    ,default=post.title) %]
 [% form_text(name='tag_names',label=c.loc('Tags')
-    ,value=tag_list) %]
+    ,default=tag_list) %]
 [% form_textarea(name='content',label=c.loc('Content'),required=1
-    ,value=post.content) %]
+    ,default=post.content) %]
 
 [% form_submit(name="submit",value=c.loc('Save')) %]
 
diff --git a/templates/src/default/post/view.tt2 b/templates/src/default/post/view.tt2
index 9a81691..502544b 100644
--- a/templates/src/default/post/view.tt2
+++ b/templates/src/default/post/view.tt2
@@ -3,7 +3,7 @@
     %]</a> &larr; [% post.title | html %][% translation(post) %]</h2>
 
 [% PROCESS 'post/tag-list' %]
-[% PROCESS 'include/available_languages' entry = post %]
+[% PROCESS 'include/available_translations' entry = post %]
 
 <div class="bbcode-strict">
 [% post.content | bbcode %]
-- 
2.11.4.GIT