[9748] インストーラの Locale 設定箇所を削除 (ttssh2-commit) - Tera Term

Revision: 9748
          https://osdn.net/projects/ttssh2/scm/svn/commits/9748
Author:   zmatsuo
Date:     2022-02-17 22:14:34 +0900 (Thu, 17 Feb 2022)
Log Message:
-----------
インストーラの Locale 設定箇所を削除

- Locale は使用しなくなった(r9313)

Revision Links:
--------------
    https://osdn.net/projects/ttssh2/scm/svn/commits/9313

Modified Paths:
--------------
    trunk/installer/release/TERATERM.INI
    trunk/installer/setini.pl
    trunk/installer/teraterm.iss
    trunk/installer/teraterm_cmake.iss.in

-------------- next part --------------
Modified: trunk/installer/release/TERATERM.INI
===================================================================

--- trunk/installer/release/TERATERM.INI	2022-02-17 13:14:24 UTC (rev 9747)
+++ trunk/installer/release/TERATERM.INI	2022-02-17 13:14:34 UTC (rev 9748)
@@ -121,10 +121,6 @@
 ; Viewlog Editor path
 ViewlogEditor=notepad.exe
 
-; Locale for Unicode
-;Locale=chs
-Locale=
-
 ; Background color of text uses background color of screen (on/off)
 UseNormalBGColor=on
 

Modified: trunk/installer/setini.pl
===================================================================
--- trunk/installer/setini.pl	2022-02-17 13:14:24 UTC (rev 9747)
+++ trunk/installer/setini.pl	2022-02-17 13:14:34 UTC (rev 9748)
@@ -3,7 +3,6 @@
 open INI, $ARGV[0];
 while(<INI>){
 	s/^(Language\s*=).*$/$1Japanese/;
-	s/^(Locale\s*=).*$/$1japanese/;
 #	s/^(VTFont\s*=).*$/$1Terminal,0,-19,128/;
 	s/^(VTFont\s*=).*$/$1\x82l\x82r \x83S\x83V\x83b\x83N,0,-16,128/;
 	s/^(TEKFont\s*=).*$/$1Terminal,0,8,128/;

Modified: trunk/installer/teraterm.iss
===================================================================
--- trunk/installer/teraterm.iss	2022-02-17 13:14:24 UTC (rev 9747)
+++ trunk/installer/teraterm.iss	2022-02-17 13:14:34 UTC (rev 9748)
@@ -483,7 +483,6 @@
 procedure SetIniFile(iniFile: String);
 var
   Language      : String;
-  Locale        : String;
   VTFont        : String;
   TEKFont       : String;
   TCPPort       : integer;
@@ -492,7 +491,6 @@
 
 begin
   Language       := GetIniString('Tera Term', 'Language', '', iniFile);
-  Locale         := GetIniString('Tera Term', 'Locale', '', iniFile);
   VTFont         := GetIniString('Tera Term', 'VTFont', '', iniFile);
   TEKFont        := GetIniString('Tera Term', 'TEKFont', '', iniFile);
   TCPPort        := GetIniInt('Tera Term', 'TCPPort', 0, 0, 65535, iniFile)
@@ -502,20 +500,6 @@
   case GetUILanguage and $3FF of
   $04: // Chinese
     begin
-
-      case GetUILanguage of
-      $c04, $1404, $404: // Hong Kong, Macao, Taiwan
-        begin
-          if Length(Locale) = 0 then
-            SetIniString('Tera Term', 'Locale', 'cht', iniFile);
-        end;
-      else
-        begin
-          if Length(Locale) = 0 then
-            SetIniString('Tera Term', 'Locale', 'chs', iniFile);
-        end;
-      end;
-
       if Length(Language) = 0 then
         SetIniString('Tera Term', 'Language', 'UTF-8', iniFile);
       if Length(VTFont) = 0 then
@@ -527,8 +511,6 @@
     begin
       if Length(Language) = 0 then
         SetIniString('Tera Term', 'Language', 'Japanese', iniFile);
-      if Length(Locale) = 0 then
-        SetIniString('Tera Term', 'Locale', 'japanese', iniFile);
       if Length(VTFont) = 0 then
         SetIniString('Tera Term', 'VTFont', 'Terminal,0,-19,128', iniFile);
       if Length(TEKFont) = 0 then
@@ -538,8 +520,6 @@
     begin
       if Length(Language) = 0 then
         SetIniString('Tera Term', 'Language', 'Korean', iniFile);
-      if Length(Locale) = 0 then
-        SetIniString('Tera Term', 'Locale', 'korean', iniFile);
       if Length(VTFont) = 0 then
         SetIniString('Tera Term', 'VTFont', 'Terminal,0,-12,255', iniFile);
       if Length(TEKFont) = 0 then
@@ -549,8 +529,6 @@
     begin
       if Length(Language) = 0 then
         SetIniString('Tera Term', 'Language', 'Russian', iniFile);
-      if Length(Locale) = 0 then
-        SetIniString('Tera Term', 'Locale', 'russian', iniFile);
       if Length(VTFont) = 0 then
         SetIniString('Tera Term', 'VTFont', 'Terminal,0,-12,255', iniFile);
       if Length(TEKFont) = 0 then
@@ -563,15 +541,11 @@
 
         if Length(Language) = 0 then
           SetIniString('Tera Term', 'Language', 'UTF-8', iniFile);
-        if Length(Locale) = 0 then
-          SetIniString('Tera Term', 'Locale', 'american', iniFile);
 
       end else begin // Other
 
         if Length(Language) = 0 then
           SetIniString('Tera Term', 'Language', 'English', iniFile);
-        if Length(Locale) = 0 then
-          SetIniString('Tera Term', 'Locale', 'english', iniFile);
 
       end;
 

Modified: trunk/installer/teraterm_cmake.iss.in
===================================================================
--- trunk/installer/teraterm_cmake.iss.in	2022-02-17 13:14:24 UTC (rev 9747)
+++ trunk/installer/teraterm_cmake.iss.in	2022-02-17 13:14:34 UTC (rev 9748)
@@ -476,7 +476,6 @@
 procedure SetIniFile(iniFile: String);
 var
   Language      : String;
-  Locale        : String;
   VTFont        : String;
   TEKFont       : String;
   TCPPort       : integer;
@@ -485,7 +484,6 @@
 
 begin
   Language       := GetIniString('Tera Term', 'Language', '', iniFile);
-  Locale         := GetIniString('Tera Term', 'Locale', '', iniFile);
   VTFont         := GetIniString('Tera Term', 'VTFont', '', iniFile);
   TEKFont        := GetIniString('Tera Term', 'TEKFont', '', iniFile);
   TCPPort        := GetIniInt('Tera Term', 'TCPPort', 0, 0, 65535, iniFile)
@@ -495,20 +493,6 @@
   case GetUILanguage and $3FF of
   $04: // Chinese
     begin
-
-      case GetUILanguage of
-      $c04, $1404, $404: // Hong Kong, Macao, Taiwan
-        begin
-          if Length(Locale) = 0 then
-            SetIniString('Tera Term', 'Locale', 'cht', iniFile);
-        end;
-      else
-        begin
-          if Length(Locale) = 0 then
-            SetIniString('Tera Term', 'Locale', 'chs', iniFile);
-        end;
-      end;
-
       if Length(Language) = 0 then
         SetIniString('Tera Term', 'Language', 'UTF-8', iniFile);
       if Length(VTFont) = 0 then
@@ -520,8 +504,6 @@
     begin
       if Length(Language) = 0 then
         SetIniString('Tera Term', 'Language', 'Japanese', iniFile);
-      if Length(Locale) = 0 then
-        SetIniString('Tera Term', 'Locale', 'japanese', iniFile);
       if Length(VTFont) = 0 then
         SetIniString('Tera Term', 'VTFont', 'Terminal,0,-19,128', iniFile);
       if Length(TEKFont) = 0 then
@@ -531,8 +513,6 @@
     begin
       if Length(Language) = 0 then
         SetIniString('Tera Term', 'Language', 'Korean', iniFile);
-      if Length(Locale) = 0 then
-        SetIniString('Tera Term', 'Locale', 'korean', iniFile);
       if Length(VTFont) = 0 then
         SetIniString('Tera Term', 'VTFont', 'Terminal,0,-12,255', iniFile);
       if Length(TEKFont) = 0 then
@@ -542,8 +522,6 @@
     begin
       if Length(Language) = 0 then
         SetIniString('Tera Term', 'Language', 'Russian', iniFile);
-      if Length(Locale) = 0 then
-        SetIniString('Tera Term', 'Locale', 'russian', iniFile);
       if Length(VTFont) = 0 then
         SetIniString('Tera Term', 'VTFont', 'Terminal,0,-12,255', iniFile);
       if Length(TEKFont) = 0 then
@@ -556,15 +534,11 @@
 
         if Length(Language) = 0 then
           SetIniString('Tera Term', 'Language', 'UTF-8', iniFile);
-        if Length(Locale) = 0 then
-          SetIniString('Tera Term', 'Locale', 'american', iniFile);
 
       end else begin // Other
 
         if Length(Language) = 0 then
           SetIniString('Tera Term', 'Language', 'English', iniFile);
-        if Length(Locale) = 0 then
-          SetIniString('Tera Term', 'Locale', 'english', iniFile);
 
       end;
 


Tera Term

[ttssh2-commit] [9748] インストーラの Locale 設定箇所を削除