From d8b295a65c1c40383566a822e16ec24ef4bfc126 Mon Sep 17 00:00:00 2001
From: Masahiro Iuchi <miuchi@sixapart.com>
Date: Wed, 17 Apr 2024 13:31:58 +0900
Subject: [PATCH] Remove "Premium" from product name. MTC-29580

Conflicts:
      build/mt-dists/default.mk
      lib/MT.pm
---
 Makefile                   |  3 ++-
 build/mt-dists/MTP.mk      |  4 ++--
 build/mt-dists/MTPA.mk     |  4 ++--
 build/mt-dists/MTPCLOUD.mk |  4 ++--
 build/mt-dists/default.mk  |  1 +
 lib/MT.pm                  |  2 +-
 lib/MT/I18N/ja.pm          |  6 ++---
 t/mt-portal-site.t         | 49 ++++++++++++++++++++++++++++++++++++++
 8 files changed, 62 insertions(+), 11 deletions(-)
 create mode 100644 t/mt-portal-site.t

diff --git a/Makefile b/Makefile
index a72312b018..09de584450 100644
--- a/Makefile
+++ b/Makefile
@@ -166,6 +166,7 @@ check:
 lib/MT.pm: build-language-stamp build/mt-dists/$(BUILD_PACKAGE).mk build/mt-dists/default.mk
 	mv lib/MT.pm lib/MT.pm.pre
 	sed -e "s!__PRODUCT_NAME__!$(PRODUCT_NAME)!g" \
+	    -e "s!__PRODUCT_CODE__!$(PRODUCT_CODE)!g" \
 	    -e "s!__BUILD_ID__!$(BUILD_VERSION_ID)!g" \
 	    -e "s!__PORTAL_URL__!$(PORTAL_URL)!g" \
 	    -e "s!__PRODUCT_VERSION_ID__!$(BUILD_VERSION_ID)!g" \
@@ -230,4 +231,4 @@ clean:
 # test tasks
 -include t/test.mk
 -include t/docker-test.mk
-	
\ No newline at end of file
+	
diff --git a/build/mt-dists/MTP.mk b/build/mt-dists/MTP.mk
index 0e804c2c46..4d675bb1d6 100644
--- a/build/mt-dists/MTP.mk
+++ b/build/mt-dists/MTP.mk
@@ -1,2 +1,2 @@
-PRODUCT_NAME = Movable Type Premium
-PRODUCT_CODE = MT
+PRODUCT_NAME = Movable Type
+PRODUCT_CODE = MTP
diff --git a/build/mt-dists/MTPA.mk b/build/mt-dists/MTPA.mk
index b786a40769..aae9c269d8 100644
--- a/build/mt-dists/MTPA.mk
+++ b/build/mt-dists/MTPA.mk
@@ -1,2 +1,2 @@
-PRODUCT_NAME = Movable Type Premium (Advanced)
-PRODUCT_CODE = MT
+PRODUCT_NAME = Movable Type Advanced
+PRODUCT_CODE = MTP
diff --git a/build/mt-dists/MTPCLOUD.mk b/build/mt-dists/MTPCLOUD.mk
index 0e804c2c46..4d675bb1d6 100644
--- a/build/mt-dists/MTPCLOUD.mk
+++ b/build/mt-dists/MTPCLOUD.mk
@@ -1,2 +1,2 @@
-PRODUCT_NAME = Movable Type Premium
-PRODUCT_CODE = MT
+PRODUCT_NAME = Movable Type
+PRODUCT_CODE = MTP
diff --git a/build/mt-dists/default.mk b/build/mt-dists/default.mk
index b5ae1611bb..64930a55e5 100644
--- a/build/mt-dists/default.mk
+++ b/build/mt-dists/default.mk
@@ -1,4 +1,5 @@
 PRODUCT_NAME = Movable Type Core
+PRODUCT_CODE = MT
 PRODUCT_VERSION = 8.0
 
 VERSION_SUFFIX = 
diff --git a/lib/MT.pm b/lib/MT.pm
index 48c6805c78..2a11fdc881 100644
--- a/lib/MT.pm
+++ b/lib/MT.pm
@@ -45,7 +45,7 @@ BEGIN {
         $RELEASE_VERSION_ID
         )
         = (
-        '__PRODUCT_NAME__',   'MT',
+        '__PRODUCT_NAME__',   '__PRODUCT_CODE__',
         '8.0.2',              '__PRODUCT_VERSION_ID__',
         '__RELEASE_NUMBER__', '__PORTAL_URL__',
         '__RELEASE_VERSION_ID__',
diff --git a/lib/MT/I18N/ja.pm b/lib/MT/I18N/ja.pm
index b56e3da94d..bb30af7649 100644
--- a/lib/MT/I18N/ja.pm
+++ b/lib/MT/I18N/ja.pm
@@ -31,10 +31,10 @@ sub DISPLAY_LENGTH_EDIT_ENTRY_TEXT_FROM_EXCERPT ()     {25}
 sub DISPLAY_LENGTH_EDIT_ENTRY_TEXT_BREAK_UP ()         {30}
 
 sub PORTAL_URL {
-    if ($MT::PRODUCT_NAME eq 'Movable Type Advanced') {
-        return 'https://www.sixapart.jp/movabletype/solutions/mta.html';
-    } elsif ($MT::PRODUCT_NAME =~ /Movable Type Premium/) {
+    if ($MT::PRODUCT_CODE eq 'MTP') {
         return 'https://www.sixapart.jp/movabletype/solutions/mtpremium.html';
+    } elsif ($MT::PRODUCT_NAME eq 'Movable Type Advanced') {
+        return 'https://www.sixapart.jp/movabletype/solutions/mta.html';
     } else {
         return 'https://www.sixapart.jp/movabletype/';
     }
diff --git a/t/mt-portal-site.t b/t/mt-portal-site.t
new file mode 100644
index 0000000000..dd9d6c67f6
--- /dev/null
+++ b/t/mt-portal-site.t
@@ -0,0 +1,49 @@
+#!/usr/bin/perl
+use strict;
+use warnings;
+use FindBin;
+use lib "$FindBin::Bin/lib";    # t/lib
+use Test::More;
+use MT::Test::Env;
+our $test_env;
+BEGIN {
+    $test_env = MT::Test::Env->new(
+        DefaultLanguage => 'ja',
+    );
+    $ENV{MT_CONFIG} = $test_env->config_file;
+}
+
+use MT;
+MT->instance;
+
+my @test_suite = ({
+        product_name => 'Movable Type',
+        product_code => 'MT',
+        portal_url   => 'https://www.sixapart.jp/movabletype/',
+    },
+    {
+        product_name => 'Movable Type Advanced',
+        product_code => 'MT',
+        portal_url   => 'https://www.sixapart.jp/movabletype/solutions/mta.html',
+    },
+    {
+        product_name => 'Movable Type',
+        product_code => 'MTP',
+        portal_url   => 'https://www.sixapart.jp/movabletype/solutions/mtpremium.html',
+    },
+    {
+        product_name => 'Movable Type Advanced',
+        product_code => 'MTP',
+        portal_url   => 'https://www.sixapart.jp/movabletype/solutions/mtpremium.html',
+    },
+);
+
+for my $test (@test_suite) {
+    subtest '$PRODUCT_NAME: ' . $test->{product_name} . ', $PRODUCT_CODE: ' . $test->{product_code} => sub {
+        $MT::PRODUCT_NAME = $test->{product_name};
+        $MT::PRODUCT_CODE = $test->{product_code};
+        is(MT->portal_url, $test->{portal_url}, 'MT->portal_url: ' . $test->{portal_url});
+    };
+}
+
+done_testing;