17 files changed, 200 insertions, 1 deletions

diff --git a/russian/MT/Makefile b/russian/MT/Makefile
index 3498c687d388..63cfd56e1c4d 100644
--- a/russian/MT/Makefile
+++ b/russian/MT/Makefile
@@ -3,10 +3,11 @@
 
 CATEGORIES=	russian www
 MASTER_SITES=	http://movable-type.ru/downloads/
-DISTNAME=	MTOS-${PORTVERSION}-${PKGNAMEPREFIX:S,-,,}
+DISTNAME=	MTOS-5.2.9-${PKGNAMEPREFIX:S,-,,}
 
 COMMENT=	Russian localization of the MovableType publishing system
 
+PATCHDIR=	${.CURDIR}/files
 MASTERDIR=	${.CURDIR}/../../www/MT
 MT_LANG=	${PKGNAMEPREFIX:S,-,,U}
 CONFLICTS=	MT-[2-5].* de-MT-[2-5].* fr-MT-[2-5].* ja-MT-[2-5].*
diff --git a/russian/MT/files/patch-default_templates__comment_response.mtml b/russian/MT/files/patch-default_templates__comment_response.mtml
new file mode 100644
index 000000000000..6f4eb0ba9b3c
--- /dev/null
+++ b/russian/MT/files/patch-default_templates__comment_response.mtml
@@ -0,0 +1,11 @@
+--- default_templates/comment_response.mtml.orig	2013-12-02 02:38:32.000000000 +0900
++++ default_templates/comment_response.mtml	2014-04-16 15:17:26.000000000 +0900
+@@ -15,7 +15,7 @@
+ <mt:Else name="comment_error">
+     <mt:Ignore><!-- Error message when comment submission fails --></mt:Ignore>
+     <$mt:Var name="page_title" value="<__trans phrase="Comment Submission Error">"$>
+-    <mt:SetVarBlock name="message"><p><__trans phrase="Your comment submission failed for the following reasons: [_1]" params="<$mt:ErrorMessage$>"></p></mt:SetVarBlock>
++    <mt:SetVarBlock name="message"><p><__trans phrase="Your comment submission failed for the following reasons: [_1]" params="<$mt:ErrorMessage encode_html="1"$>"></p></mt:SetVarBlock>
+ </mt:If>
+ 
+ 
diff --git a/russian/MT/files/patch-lib__MT.pm b/russian/MT/files/patch-lib__MT.pm
new file mode 100644
index 000000000000..7354f7ff2d48
--- /dev/null
+++ b/russian/MT/files/patch-lib__MT.pm
@@ -0,0 +1,31 @@
+--- lib/MT.pm.orig	2013-12-02 02:40:30.000000000 +0900
++++ lib/MT.pm	2014-04-16 15:18:36.000000000 +0900
+@@ -39,8 +39,8 @@
+         )
+         = (
+         'Movable Type',   'MT',
+-        '5.2.9',              '5.2.9-ru',
+-        '9', 'http://movable-type.ru/'
++        '5.2.10',              '5.2.10-ru',
++        '10', 'http://movable-type.ru/'
+         );
+ 
+   # To allow MT to run straight from svn, if no build process (pre-processing)
+@@ -56,7 +56,7 @@
+     }
+ 
+     if ( $RELEASE_NUMBER eq '__RELEASE' . '_NUMBER__' ) {
+-        $RELEASE_NUMBER = 9;
++        $RELEASE_NUMBER = 10;
+     }
+ 
+     $DebugMode = 0;
+@@ -124,7 +124,7 @@
+ }
+ 
+ sub build_id {
+-    my $build_id = '5.2.9-ru';
++    my $build_id = '5.2.10-ru';
+     $build_id = '' if $build_id eq '__BUILD_' . 'ID__';
+     return $build_id;
+ }
diff --git a/russian/MT/files/patch-mt-check.cgi b/russian/MT/files/patch-mt-check.cgi
new file mode 100644
index 000000000000..c27cc51f3042
--- /dev/null
+++ b/russian/MT/files/patch-mt-check.cgi
@@ -0,0 +1,14 @@
+--- mt-check.cgi.orig	2013-12-02 02:40:30.000000000 +0900
++++ mt-check.cgi	2014-04-16 15:19:09.000000000 +0900
+@@ -97,9 +97,9 @@
+ my $view    = $cgi->param("view");
+ my $version = $cgi->param("version");
+ my $sess_id = $cgi->param('session_id');
+-$version ||= '5.2.9-ru';
++$version ||= '5.2.10-ru';
+ if ( $version eq '__PRODUCT_VERSION' . '_ID__' ) {
+-    $version = '5.2.9';
++    $version = '5.2.10';
+ }
+ 
+ my ( $mt, $LH );
diff --git a/russian/MT/files/patch-mt-static__css__main.css b/russian/MT/files/patch-mt-static__css__main.css
new file mode 100644
index 000000000000..c8559d96f99e
--- /dev/null
+++ b/russian/MT/files/patch-mt-static__css__main.css
@@ -0,0 +1,8 @@
+--- mt-static/css/main.css.orig	2013-12-02 02:40:33.000000000 +0900
++++ mt-static/css/main.css	2014-04-16 15:19:43.000000000 +0900
+@@ -1,4 +1,4 @@
+-/* Movable Type (r) Open Source (C) 2001-2013 Six Apart, Ltd.
++/* Movable Type (r) Open Source (C) 2001-2014 Six Apart, Ltd.
+  * This file is combined from multiple sources.  Consult the source files for their
+  * respective licenses and copyrights.
+  */html{font-size:100%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;}body{margin:0;}h1,
diff --git a/russian/MT/files/patch-mt-static__css__simple.css b/russian/MT/files/patch-mt-static__css__simple.css
new file mode 100644
index 000000000000..a4b031b9799d
--- /dev/null
+++ b/russian/MT/files/patch-mt-static__css__simple.css
@@ -0,0 +1,8 @@
+--- mt-static/css/simple.css.orig	2013-12-02 02:40:34.000000000 +0900
++++ mt-static/css/simple.css	2014-04-16 15:20:06.000000000 +0900
+@@ -1,4 +1,4 @@
+-/* Movable Type (r) Open Source (C) 2001-2013 Six Apart, Ltd.
++/* Movable Type (r) Open Source (C) 2001-2014 Six Apart, Ltd.
+  * This file is combined from multiple sources.  Consult the source files for their
+  * respective licenses and copyrights.
+  */html{font-size:100%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;}body{margin:0;}h1,
diff --git a/russian/MT/files/patch-mt-static__js__editor.js b/russian/MT/files/patch-mt-static__js__editor.js
new file mode 100644
index 000000000000..3585683e1975
--- /dev/null
+++ b/russian/MT/files/patch-mt-static__js__editor.js
@@ -0,0 +1,8 @@
+--- mt-static/js/editor.js.orig	2013-12-02 02:40:32.000000000 +0900
++++ mt-static/js/editor.js	2014-04-16 15:20:42.000000000 +0900
+@@ -1,4 +1,4 @@
+-/* Movable Type (r) Open Source (C) 2001-2013 Six Apart, Ltd.
++/* Movable Type (r) Open Source (C) 2001-2014 Six Apart, Ltd.
+  * This file is combined from multiple sources.  Consult the source files for their
+  * respective licenses and copyrights.
+  */;(function($){MT.EditorManager=function(){this.init.apply(this,arguments);};$.extend(MT.EditorManager,{editors:{},editorsForFormat:{},map:{},defaultWrapTag:'div',defaultWrapClass:'mt-editor-manager-wrap',register:function(id,editor){var thisConstructor=this;this.editors[id]=editor;$.each(editor.formatsForCurrentContext(),function(){if(!thisConstructor.editorsForFormat[this]){thisConstructor.editorsForFormat[this]=[];}
diff --git a/russian/MT/files/patch-mt-static__js__mt_core_compact.js b/russian/MT/files/patch-mt-static__js__mt_core_compact.js
new file mode 100644
index 000000000000..e6b02fd405c1
--- /dev/null
+++ b/russian/MT/files/patch-mt-static__js__mt_core_compact.js
@@ -0,0 +1,8 @@
+--- mt-static/js/mt_core_compact.js.orig	2013-12-02 02:40:32.000000000 +0900
++++ mt-static/js/mt_core_compact.js	2014-04-16 15:21:04.000000000 +0900
+@@ -1,4 +1,4 @@
+-/* Movable Type (r) Open Source (C) 2001-2013 Six Apart, Ltd.
++/* Movable Type (r) Open Source (C) 2001-2014 Six Apart, Ltd.
+  * This file is combined from multiple sources.  Consult the source files for their
+  * respective licenses and copyrights.
+  */defined=function(x){return x!==undefined;};exists=function(x){return(x===undefined||x===null)?false:true;};truth=function(x){return(x&&x!="0")?true:false;};finite=function(x){return isFinite(x)?x:0;};finiteInt=function(x,b){return finite(parseInt(x,b));};finiteFloat=function(x){return finite(parseFloat(x));};max=function(){var a=arguments;var n=a[0];for(var i=1;i<a.length;i++)
diff --git a/russian/MT/files/patch-php__mt.php b/russian/MT/files/patch-php__mt.php
new file mode 100644
index 000000000000..edef619b637c
--- /dev/null
+++ b/russian/MT/files/patch-php__mt.php
@@ -0,0 +1,22 @@
+--- php/mt.php.orig	2013-12-02 02:40:30.000000000 +0900
++++ php/mt.php	2014-04-16 15:21:49.000000000 +0900
+@@ -11,16 +11,16 @@
+ require_once('lib/class.exception.php');
+ 
+ define('VERSION', '5.2');
+-define('PRODUCT_VERSION', '5.2.9');
++define('PRODUCT_VERSION', '5.2.10');
+ 
+ $PRODUCT_NAME = 'Movable Type';
+ if($PRODUCT_NAME == '__PRODUCT' . '_NAME__')
+     $PRODUCT_NAME = 'Movable Type';
+ define('PRODUCT_NAME', $PRODUCT_NAME);
+ 
+-$RELEASE_NUMBER = '9';
++$RELEASE_NUMBER = '10';
+ if ( $RELEASE_NUMBER == '__RELEASE_' . 'NUMBER__' )
+-    $RELEASE_NUMBER = 9;
++    $RELEASE_NUMBER = 10;
+ define('RELEASE_NUMBER', $RELEASE_NUMBER);
+ 
+ $PRODUCT_VERSION_ID = '5.2.9-ru';
diff --git a/russian/MT/files/patch-themes__classic_blog__templates__comment_response.mtml b/russian/MT/files/patch-themes__classic_blog__templates__comment_response.mtml
new file mode 100644
index 000000000000..8cbe5d516518
--- /dev/null
+++ b/russian/MT/files/patch-themes__classic_blog__templates__comment_response.mtml
@@ -0,0 +1,11 @@
+--- themes/classic_blog/templates/comment_response.mtml.orig	2013-12-02 02:38:32.000000000 +0900
++++ themes/classic_blog/templates/comment_response.mtml	2014-04-16 15:22:52.000000000 +0900
+@@ -15,7 +15,7 @@
+ <mt:Else name="comment_error">
+     <mt:Ignore><!-- Error message when comment submission fails --></mt:Ignore>
+     <$mt:Var name="page_title" value="<__trans phrase="Comment Submission Error">"$>
+-    <mt:SetVarBlock name="message"><p><__trans phrase="Your comment submission failed for the following reasons: [_1]" params="<$mt:ErrorMessage$>"></p></mt:SetVarBlock>
++    <mt:SetVarBlock name="message"><p><__trans phrase="Your comment submission failed for the following reasons: [_1]" params="<$mt:ErrorMessage encode_html="1"$>"></p></mt:SetVarBlock>
+ </mt:If>
+ 
+ 
diff --git a/russian/MT/files/patch-themes__classic_blog__theme.yaml b/russian/MT/files/patch-themes__classic_blog__theme.yaml
new file mode 100644
index 000000000000..0269e5d43cf8
--- /dev/null
+++ b/russian/MT/files/patch-themes__classic_blog__theme.yaml
@@ -0,0 +1,11 @@
+--- themes/classic_blog/theme.yaml.orig	2013-12-02 02:38:32.000000000 +0900
++++ themes/classic_blog/theme.yaml	2014-04-16 15:23:26.000000000 +0900
+@@ -2,7 +2,7 @@
+ id: classic_blog
+ author_name: Six Apart, Ltd.
+ author_link: http://www.movabletype.org/
+-version: 1.11
++version: 1.12
+ class: blog
+ protected: 1
+ description: <__trans phrase="A traditional blogging design that comes with plenty of styles and a selection of 2 column / 3 column layouts. Best for use in standard blog publishing applications.">
diff --git a/russian/MT/files/patch-themes__classic_website__templates__comment_response.mtml b/russian/MT/files/patch-themes__classic_website__templates__comment_response.mtml
new file mode 100644
index 000000000000..d23f4b4fb259
--- /dev/null
+++ b/russian/MT/files/patch-themes__classic_website__templates__comment_response.mtml
@@ -0,0 +1,11 @@
+--- themes/classic_website/templates/comment_response.mtml.orig	2013-12-02 02:38:32.000000000 +0900
++++ themes/classic_website/templates/comment_response.mtml	2014-04-16 15:25:24.000000000 +0900
+@@ -15,7 +15,7 @@
+ <mt:Else name="comment_error">
+     <mt:Ignore><!-- Error message when comment submission fails --></mt:Ignore>
+     <$mt:Var name="page_title" value="<__trans phrase="Comment Submission Error">"$>
+-    <mt:SetVarBlock name="message"><p><__trans phrase="Your comment submission failed for the following reasons: [_1]" params="<$mt:ErrorMessage$>"></p></mt:SetVarBlock>
++    <mt:SetVarBlock name="message"><p><__trans phrase="Your comment submission failed for the following reasons: [_1]" params="<$mt:ErrorMessage encode_html="1"$>"></p></mt:SetVarBlock>
+ </mt:If>
+ 
+ 
diff --git a/russian/MT/files/patch-themes__classic_website__theme.yaml b/russian/MT/files/patch-themes__classic_website__theme.yaml
new file mode 100644
index 000000000000..81c8dd82d929
--- /dev/null
+++ b/russian/MT/files/patch-themes__classic_website__theme.yaml
@@ -0,0 +1,11 @@
+--- themes/classic_website/theme.yaml.orig	2013-12-02 02:38:32.000000000 +0900
++++ themes/classic_website/theme.yaml	2014-04-16 15:25:48.000000000 +0900
+@@ -2,7 +2,7 @@
+ id: classic_website
+ author_name: Six Apart, Ltd.
+ author_link: http://www.movabletype.org/
+-version: 1.11
++version: 1.12
+ class: website
+ protected: 1
+ description: <__trans phrase="Create a blog portal that aggregates contents from several blogs in one website.">
diff --git a/russian/MT/files/patch-themes__pico__templates__comment_response.mtml b/russian/MT/files/patch-themes__pico__templates__comment_response.mtml
new file mode 100644
index 000000000000..9d1f7714277d
--- /dev/null
+++ b/russian/MT/files/patch-themes__pico__templates__comment_response.mtml
@@ -0,0 +1,12 @@
+--- themes/pico/templates/comment_response.mtml.orig	2013-12-02 02:38:32.000000000 +0900
++++ themes/pico/templates/comment_response.mtml	2014-04-16 15:26:22.000000000 +0900
+@@ -16,7 +16,8 @@
+ <mt:Else name="comment_error">
+     <mt:Ignore><!-- Error message when comment submission fails --></mt:Ignore>
+     <$mt:Var name="page_title" value="<__trans phrase="Comment Submission Error">"$>
+-    <mt:SetVarBlock name="message"><p><__trans phrase="Your comment submission failed for the following reasons: [_1]" params="<$mt:ErrorMessage$>"></p></mt:SetVarBlock>
++    <mt:SetVarBlock name="message"><p><__trans phrase="Your comment submission failed for the following reasons: [_1]" params="<$mt:ErrorMessage encode_html="1"$>"></p></mt:SetVarBlock>
++ </mt:If>
+ </mt:If>
+ 
+ 
diff --git a/russian/MT/files/patch-themes__pico__theme.yaml b/russian/MT/files/patch-themes__pico__theme.yaml
new file mode 100644
index 000000000000..3711e2ca05e4
--- /dev/null
+++ b/russian/MT/files/patch-themes__pico__theme.yaml
@@ -0,0 +1,11 @@
+--- themes/pico/theme.yaml.orig	2013-12-02 02:38:33.000000000 +0900
++++ themes/pico/theme.yaml	2014-04-16 15:26:41.000000000 +0900
+@@ -2,7 +2,7 @@
+ id: pico
+ author_name: Six Apart, Ltd.
+ author_link: http://www.movabletype.org/
+-version: 1.11
++version: 1.12
+ class: blog
+ protected: 1
+ description: <__trans phrase="Pico is a microblogging theme, designed for keeping things simple to handle frequent updates. To put the focus on content we've moved the sidebars below the list of posts.">
diff --git a/russian/MT/files/patch-themes__rainier__templates__comment_response.mtml b/russian/MT/files/patch-themes__rainier__templates__comment_response.mtml
new file mode 100644
index 000000000000..6256b8a4976d
--- /dev/null
+++ b/russian/MT/files/patch-themes__rainier__templates__comment_response.mtml
@@ -0,0 +1,11 @@
+--- themes/rainier/templates/comment_response.mtml.orig	2013-12-02 02:38:33.000000000 +0900
++++ themes/rainier/templates/comment_response.mtml	2014-04-16 15:27:29.000000000 +0900
+@@ -6,7 +6,7 @@
+   <$mt:Var name="message" value="<p class="message success"><__trans phrase="Your comment has been received and held for review by a blog administrator."></p>"$>
+ <mt:Else name="comment_error">
+   <$mt:Var name="page_title" value="<__trans phrase="Comment Submission Error">"$>
+-  <mt:SetVarBlock name="message"><p class="message error"><__trans phrase="Your comment submission failed for the following reasons: [_1]" params="<$mt:ErrorMessage$>"></p></mt:SetVarBlock>
++  <mt:SetVarBlock name="message"><p class="message error"><__trans phrase="Your comment submission failed for the following reasons: [_1]" params="<$mt:ErrorMessage encode_html="1"$>"></p></mt:SetVarBlock>
+ </mt:If>
+ <!DOCTYPE html>
+ <html>
diff --git a/russian/MT/files/patch-themes__rainier__theme.yaml b/russian/MT/files/patch-themes__rainier__theme.yaml
new file mode 100644
index 000000000000..dafe1df99c0b
--- /dev/null
+++ b/russian/MT/files/patch-themes__rainier__theme.yaml
@@ -0,0 +1,10 @@
+--- themes/rainier/theme.yaml.orig	2013-12-02 02:38:33.000000000 +0900
++++ themes/rainier/theme.yaml	2014-04-16 15:27:46.000000000 +0900
+@@ -1,6 +1,6 @@
+ label: 'Rainier'
+ id: 'rainier'
+-version: 1.03
++version: 1.04
+ author_link: 'http://www.sixapart.com/'
+ author_name: 'Six Apart, Ltd.'
+ class: 'blog'