Changeset 3531 for trunk/lib/MT/I18N

Timestamp:

03/12/09 09:11:52 (9 months ago)

Author:

fumiakiy

Message:

Merged sockfish to trunk. "svn merge -r3114:3527 http://code.sixapart.com/svn/movabletype/branches/sockfish/ ."

Location:

trunk/lib/MT/I18N

Files:

• default.pm (modified) (4 diffs)
• en_us.pm (modified) (1 diff)
• ja.pm (modified) (2 diffs)

trunk/lib/MT/I18N/default.pm

@@ -1 @@
-# Movable Type (r) Open Source (C) 2001-2008 Six Apart, Ltd.
+# Movable Type (r) Open Source (C) 2001-2009 Six Apart, Ltd.
 # This program is distributed under the terms of the
 # GNU General Public License, version 2.
@@ -60 +60 @@
     $class->$meth(@_);
 }
+
+sub encode {
+    my $class = shift;
+    my $meth = 'encode_' . ($PKG || $class->_load_module);
+    $class->$meth(@_);
+}
+
 sub guess_encoding {
     my $class = shift;
@@ -105 +112 @@
     $class->$meth(@_);
 }
+
 sub decode_utf8 {
     my $class = shift;
@@ -132 +140 @@
 
 sub decode_perl {
+    my $class = shift;
+    my ($enc, $text) = @_;
+    $text;
+}
+
+sub encode_perl {
     my $class = shift;
     my ($enc, $text) = @_;

trunk/lib/MT/I18N/en_us.pm

@@ -1 @@
-# Movable Type (r) Open Source (C) 2001-2008 Six Apart, Ltd.
+# Movable Type (r) Open Source (C) 2001-2009 Six Apart, Ltd.
 # This program is distributed under the terms of the
 # GNU General Public License, version 2.

trunk/lib/MT/I18N/ja.pm

@@ -1 @@
-# Movable Type (r) Open Source (C) 2001-2008 Six Apart, Ltd.
+# Movable Type (r) Open Source (C) 2001-2009 Six Apart, Ltd.
 # This program is distributed under the terms of the
 # GNU General Public License, version 2.
@@ -84 +84 @@
     $enc = $class->_conv_enc_label($enc);
     return $enc;
+}
+
+sub encode_jcode {
+    my $class = shift;
+    my ($enc, $text) = @_;
+    return $class->encode_text_jcode($text, 'utf-8', $enc);
 }