Affelio

[Affelio-cvs 541] CVS update: affelio/apps/diary

Masato Kikuhara en-sf****@users*****
2005年 7月 6日 (水) 07:06:14 JST

• 前の記事 [Affelio-cvs 540] CVS update: affelio/apps/diary/Diary/L10N
• 次の記事 [Affelio-cvs 542] CVS update: affelio/apps/diary/Diary/L10N
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]

Index: affelio/apps/diary/Diary.pm
diff -u affelio/apps/diary/Diary.pm:1.22 affelio/apps/diary/Diary.pm:1.23
--- affelio/apps/diary/Diary.pm:1.22	Wed Jul  6 02:30:03 2005
+++ affelio/apps/diary/Diary.pm	Wed Jul  6 07:06:13 2005
@@ -54,7 +54,7 @@
 	###########################
 	#Locale init
 	###########################
-	$self->{lh} = Diary::L10N->get_handle(($afap->get_site_info("locale"),"en_us"));
+	$self->{lh} = Diary::L10N->get_handle(($afap->get_site_info("locale"),$afap->{af}->{site__locale}));
 	###########################
 	
 	my $DBConfig = Config::Tiny->new();
@@ -368,7 +368,7 @@
 	}
 	
 	$tmpl->param(
-		CALENDER => $calender, 
+		CALENDER => $self->translate_templateL10N($calender), 
 		access_control_URL => $self->{afap}->get_URL("access_control"),
 	);
 	if ($self->{afap}->check_access('write_diary')) {
@@ -411,7 +411,7 @@
 sub checkAccess {
 	my ($self, $page_name) = @_;
 	unless ($self->{afap}->check_access($page_name)) {
-		$self->accessErrorExit("このページにアクセスする権限がありません");
+		$self->accessErrorExit("You have no permittion on this page");
 	}
 }
 
@@ -428,10 +428,10 @@
 
 	unless ($self->{header_show}) {
 		print "Content-type: text/html; charset=UTF-8\n\n";
-		print $self->{afap}->get_HTML_header($self->{header_title});
+		print $self->translate_templateL10N($self->{afap}->get_HTML_header($self->{header_title}));
 	}
-	print $tmpl->output;
-	print $self->{afap}->get_HTML_footer;
+	print $self->translate_templateL10N($tmpl->output);
+	print $self->translate_templateL10N($self->{afap}->get_HTML_footer);
 	exit;
 }
 
@@ -456,10 +456,10 @@
 
 	unless ($self->{header_show}) {
 		print "Content-type: text/html; charset=UTF-8\n\n";
-		print $self->{afap}->get_HTML_header($self->{header_title});
+		print $self->translate_templateL10N($self->{afap}->get_HTML_header($self->{header_title}));
 	}
-	print $tmpl->output;
-	print $self->{afap}->get_HTML_footer;
+	print $self->translate_templateL10N($tmpl->output);
+	print $self->translate_templateL10N($self->{afap}->get_HTML_footer);
 	exit;
 }
 
@@ -586,7 +586,7 @@
 	my $res = $ua->request($req);
 	my $str = $res->as_string;
 	if ($str =~ /<error>[^1]*1[^<]*<\/error>/) {
-		$self->errorExit('Trackback Pingの送信に失敗しました。送信先アドレスが間違っている可能性があります。');
+		$self->errorExit('Failed to send trackback ping');
 	}
 }
 
@@ -711,7 +711,7 @@
 	my $filesize = 0;
 	while (my $bytesread = read($filename, $buf, 1024)) {
 		$file .= $buf;
-		$self->errorExit('ファイルのアップロード：ファイルサイズが大きすぎます') if (++$filesize >= 300);
+		$self->errorExit('Uploaded file was too big') if (++$filesize >= 300);
 	}
 
 	my $imgdir = "$self->{datadir}img/";
@@ -727,11 +727,11 @@
 	my $distfile = $basedir.basename($filename);
 
 	unless (basename($filename) =~ /^[a-zA-Z0-9\.\-\_]{1,28}\.(jpg|jpeg|png|gif|bmp)$/i) {
-		$self->errorExit('ファイルのアップロード：不正なファイルタイプです');
+		$self->errorExit('Uploaded file had invalid MIME type');
 	}
 
 	local (*OUT);
-	open(OUT, "> $distfile") or $self->errorExit('ファイルのアップロード：ファイル書き込みに失敗しました');
+	open(OUT, "> $distfile") or $self->errorExit('Failed to open file');
 	binmode OUT;
 	print OUT $file;
 	close(OUT);
Index: affelio/apps/diary/edit_diary.cgi
diff -u affelio/apps/diary/edit_diary.cgi:1.9 affelio/apps/diary/edit_diary.cgi:1.10
--- affelio/apps/diary/edit_diary.cgi:1.9	Mon Jul  4 14:49:00 2005
+++ affelio/apps/diary/edit_diary.cgi	Wed Jul  6 07:06:14 2005
@@ -18,13 +18,13 @@
 require 'init.pl';
 $diary->checkAccess('write_diary');
 
-my $id = $afap->{cgi}->param('id') or $diary->errorExit('記事番号が指定されていません');
+my $id = $afap->{cgi}->param('id') or $diary->errorExit('An article number was not specified');
 
-$diary->errorExit("存在しない記事です") unless $diary->existsEntry($id);
+$diary->errorExit("The specified article does not exist") unless $diary->existsEntry($id);
 
 my $tmpl;
 
-# 編集完了
+# submitted
 if($afap->{cgi}->param('edit')) {
 	# send trackback ping
 	if ($afap->{cgi}->param('tping_url')) {
@@ -50,21 +50,21 @@
 	exit;
 }
 
-# 削除完了
+# deleted
 elsif($afap->{cgi}->param('delete')) {
 	$diary->removeEntry($id);
 	print $diary->getRedirection("list_diary.cgi");
 	exit;
 }
 
-# 確認
+# confirm
 elsif($afap->{cgi}->param("delete_confirm")) {
 	$tmpl = HTML::Template->new(filename => "./templates/edit_diary_delete_confirm.tmpl");
 	my $entry = $diary->getEntry($id);
 	$tmpl->param(ID => $entry->{id});
 }
 
-# 編集画面
+# edit
 else {
 	$tmpl = HTML::Template->new(filename => "./templates/edit_diary_edit.tmpl");
 	my $entry = $diary->getEntry($id);
@@ -74,10 +74,10 @@
 		ID => $entry->{id},
 		TITLE => $entry->{title}, 
 		CONTENTS => $entry->{contents},
-		DATETIME => "$entry->{year}年$entry->{month}月$entry->{day}日",
+		DATETIME => "$entry->{year}/$entry->{month}/$entry->{day}",
 	);
 }
 
-print $diary->get_HTML_header;
-print $tmpl->output;
+print $diary->translate_templateL10N($diary->get_HTML_header);
+print $diary->translate_templateL10N($tmpl->output);
 print $diary->get_HTML_footer;
Index: affelio/apps/diary/external_blog.cgi
diff -u affelio/apps/diary/external_blog.cgi:1.5 affelio/apps/diary/external_blog.cgi:1.6
--- affelio/apps/diary/external_blog.cgi:1.5	Fri Jul  1 11:06:39 2005
+++ affelio/apps/diary/external_blog.cgi	Wed Jul  6 07:06:14 2005
@@ -51,7 +51,7 @@
 	$diary->checkAccess('write_diary');
 	my $tmpl = new HTML::Template(filename => "./templates/external_blog_conf.tmpl");
 	print $header;
-	print $tmpl->output;
+	print $diary->translate_templateL10N($tmpl->output);
 	print $diary->get_HTML_footer;
 	exit;
 }
@@ -67,7 +67,7 @@
 }
 else {
 	unlink($urlfile) if (-f $urlfile);
-	print $diary->errorExit("RDFの取得に失敗しました。URLが間違っている可能性があります");
+	print $diary->errorExit("Failed to get RDF file");
 }
 
 # parse and output
@@ -105,7 +105,7 @@
 );
 
 print $header;
-print $tmpl->output;
+print $diary->translate_templateL10N($tmpl->output);
 print $diary->get_HTML_footer;
 
 sub escape_html {
Index: affelio/apps/diary/init.pl
diff -u affelio/apps/diary/init.pl:1.3 affelio/apps/diary/init.pl:1.4
--- affelio/apps/diary/init.pl:1.3	Sat Jul  2 07:47:21 2005
+++ affelio/apps/diary/init.pl	Wed Jul  6 07:06:14 2005
@@ -41,5 +41,10 @@
 	$diary->accessErrorExit(' あなたはこのページへのアクセス権限がありません ');
 }
 
+sub print_af {
+	my $str = shift;
+	print $diary->translate_templateL10N($str);
+}
+
 ##########################################################################
 1;
Index: affelio/apps/diary/list_diary.cgi
diff -u affelio/apps/diary/list_diary.cgi:1.8 affelio/apps/diary/list_diary.cgi:1.9
--- affelio/apps/diary/list_diary.cgi:1.8	Sat Jul  2 07:47:21 2005
+++ affelio/apps/diary/list_diary.cgi	Wed Jul  6 07:06:14 2005
@@ -22,7 +22,7 @@
 	exit;
 }
 
-print $diary->get_HTML_header;
+print $diary->translate_templateL10N($diary->get_HTML_header);
 
 my $user = $afap->{cgi}->param("user");
 my $edit = 0;
@@ -73,6 +73,6 @@
 
 $tmpl->param(install_title => $afap->get_app_info("install_title"));
 
-print $tmpl->output;
+print $diary->translate_templateL10N($tmpl->output);
 
 print $diary->get_HTML_footer;
Index: affelio/apps/diary/owner.cgi
diff -u affelio/apps/diary/owner.cgi:1.4 affelio/apps/diary/owner.cgi:1.5
--- affelio/apps/diary/owner.cgi:1.4	Fri Jul  1 11:06:39 2005
+++ affelio/apps/diary/owner.cgi	Wed Jul  6 07:06:14 2005
@@ -47,5 +47,5 @@
 eval { require XML::Parser; } or $tmpl->param(NO_PARSER => 1);
 
 print $diary->get_HTML_header;
-print $tmpl->output;
+print $diary->translate_templateL10N($tmpl->output);
 print $diary->get_HTML_footer;
Index: affelio/apps/diary/show_diary.cgi
diff -u affelio/apps/diary/show_diary.cgi:1.8 affelio/apps/diary/show_diary.cgi:1.9
--- affelio/apps/diary/show_diary.cgi:1.8	Sat Jul  2 07:47:21 2005
+++ affelio/apps/diary/show_diary.cgi	Wed Jul  6 07:06:14 2005
@@ -18,15 +18,15 @@
 require 'init.pl';
 print $diary->get_HTML_header;
 
-my $id = $afap->{cgi}->param('id') or $diary->errorExit("記事番号が指定されていません");
+my $id = $afap->{cgi}->param('id') or $diary->errorExit("An article number was not specified");
 
-$diary->errorExit("存在しない記事です") unless $diary->existsEntry($id);
+$diary->errorExit("The specified article does not exist") unless $diary->existsEntry($id);
 
 my $entry = $diary->getEntry($id);
 
 my $tmpl = HTML::Template->new(filename => "./templates/show_diary.tmpl");
 
-# 日記
+# Diary
 $tmpl->param(
 	ID	=> $entry->{id},
 	MONTH	=> $entry->{month},
@@ -36,7 +36,7 @@
 	IMAGES	=> $diary->getUploadedImages($entry->{id}, 300, 300),
 );
 
-# コメント
+# Comment
 if($diary->getCommentsNo($id) > 0) {
 	$tmpl->param(HAS_COMMENTS => 1);
 	my @comments_param;
@@ -59,9 +59,9 @@
     $tmpl->param("comment_write" => "true");
 }
 
-# トラックバックURLの通知
+# Notify Trackback Ping URL
 print $diary->getURLDescription($id);
 
-print $tmpl->output;
+print $diary->translate_templateL10N($tmpl->output);
 
 print $diary->get_HTML_footer;
Index: affelio/apps/diary/show_trackback.cgi
diff -u affelio/apps/diary/show_trackback.cgi:1.6 affelio/apps/diary/show_trackback.cgi:1.7
--- affelio/apps/diary/show_trackback.cgi:1.6	Sat Jul  2 07:47:21 2005
+++ affelio/apps/diary/show_trackback.cgi	Wed Jul  6 07:06:14 2005
@@ -17,7 +17,7 @@
 
 require 'init.pl';
 
-my $id = $afap->{cgi}->param('id') or $diary->errorExit('$B5-;vHV9f$,;XDj$5$l$F$$$^$;$s(B');
+my $id = $afap->{cgi}->param('id') or $diary->errorExit('An article number was not specified');
 
 my $tmpl = HTML::Template->new(filename => "./templates/show_trackback.tmpl");
 
@@ -38,5 +38,5 @@
 
 print $diary->get_HTML_header;
 print $diary->getURLDescription($id);
-print $tmpl->output;
+print $diary->translate_templateL10N($tmpl->output);
 print $diary->get_HTML_footer;
Index: affelio/apps/diary/style.css
diff -u affelio/apps/diary/style.css:1.4 affelio/apps/diary/style.css:1.5
--- affelio/apps/diary/style.css:1.4	Sat Jul  2 07:47:21 2005
+++ affelio/apps/diary/style.css	Wed Jul  6 07:06:14 2005
@@ -57,7 +57,7 @@
 	border-left: 0px;
 	border-right: 0px;
 	border-bottom: 1px solid #989898;
-	font-size: 8pt;
+	font-size: 7pt;
 }
 
 table#calender td {
Index: affelio/apps/diary/write_comment.cgi
diff -u affelio/apps/diary/write_comment.cgi:1.10 affelio/apps/diary/write_comment.cgi:1.11
--- affelio/apps/diary/write_comment.cgi:1.10	Sun Jul  3 09:00:33 2005
+++ affelio/apps/diary/write_comment.cgi	Wed Jul  6 07:06:14 2005
@@ -18,23 +18,23 @@
 require 'init.pl';
 $diary->checkAccess('write_comment');
 
-my $id = $afap->{cgi}->param('id') or $diary->errorExit('記事番号が指定されていません');
+my $id = $afap->{cgi}->param('id') or $diary->errorExit('An article number was not specified');
 
-$diary->errorExit("存在しない記事です") unless $diary->existsEntry($id);
+$diary->errorExit("The specified article does not exist") unless $diary->existsEntry($id);
 
 my $user = $afap->get_visitor_info("nickname");
 
-# コメント確認画面
+# Confirm
 if($afap->{cgi}->param('comment_confirm')) {
 	my $tmpl = HTML::Template->new(filename => "./templates/write_comment_confirm.tmpl");
 	$tmpl->param(COMMENT_SHOW => $diary->escape($afap->{cgi}->param('comment')), COMMENT => $afap->{cgi}->param('comment'), ID => $id);
 	$tmpl->param(REQUIRE_NAME => 1) unless ($user);
 	print $diary->get_HTML_header;
-	print $tmpl->output;
+	print $diary->translate_templateL10N($diary->translate_templateL10N($tmpl->output));
 	print $diary->get_HTML_footer;
 }
 
-# コメントをコミット
+# Commit
 elsif($afap->{cgi}->param('comment_commit')) {
 
 	if(!$user){
@@ -55,5 +55,5 @@
 }
 
 else {
-	$diary->errorExit('不正なアクセスです');
+	$diary->errorExit('Invalid Access');
 }
Index: affelio/apps/diary/write_diary.cgi
diff -u affelio/apps/diary/write_diary.cgi:1.9 affelio/apps/diary/write_diary.cgi:1.10
--- affelio/apps/diary/write_diary.cgi:1.9	Sat Jul  2 07:47:21 2005
+++ affelio/apps/diary/write_diary.cgi	Wed Jul  6 07:06:14 2005
@@ -67,6 +67,6 @@
 	);
 }
 
-print $tmpl->output;
+print $diary->translate_templateL10N($tmpl->output);
 
 print $diary->get_HTML_footer;

• 前の記事 [Affelio-cvs 540] CVS update: affelio/apps/diary/Diary/L10N
• 次の記事 [Affelio-cvs 542] CVS update: affelio/apps/diary/Diary/L10N
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]