FreeWnn-ja.patch

   1 diff -urNp -x '*.orig' FreeWnn-1.1.1-a023.org/Wnn/etc/msg.c FreeWnn-1.1.1-a023/Wnn/etc/msg.c
   2 --- FreeWnn-1.1.1-a023.org/Wnn/etc/msg.c        2013-09-02 13:01:39.000000000 +0200
   3 +++ FreeWnn-1.1.1-a023/Wnn/etc/msg.c    2023-02-02 20:00:10.683168707 +0100
   4 @@ -412,12 +412,12 @@ main ()
   5  {
   6    struct msg_cat *cd;
   7
   8 -  cd = msg_open ("msg", "%L", "ja_JP");
   9 +  cd = msg_open ("msg", "%L", "ja");
  10
  11 -  printf (msg_get (cd, 5, "message not found\n", "ja_JP"), 555);
  12 +  printf (msg_get (cd, 5, "message not found\n", "ja"), 555);
  13    printf (msg_get (cd, 6, "message not found\n", "zh_CN"));
  14    printf (msg_get (cd, -1, "", "ja_JP"), 555);
  15 -  printf (msg_get (cd, 2, "message not found\n", "ja_JP"), "abc");
  16 +  printf (msg_get (cd, 2, "message not found\n", "ja"), "abc");
  17    printf (msg_get (cd, 100, "message not found\n", "zh_CN"), "abc");
  18  }
  19  #endif /* not_use */
  20 diff -urNp -x '*.orig' FreeWnn-1.1.1-a023.org/Wnn/include/jd_sock.h FreeWnn-1.1.1-a023/Wnn/include/jd_sock.h
  21 --- FreeWnn-1.1.1-a023.org/Wnn/include/jd_sock.h        2005-04-10 17:26:37.000000000 +0200
  22 +++ FreeWnn-1.1.1-a023/Wnn/include/jd_sock.h    2023-02-02 20:00:10.683168707 +0100
  23 @@ -57,7 +57,7 @@
  24  #ifdef  JAPANESE                /* Japanese */
  25  # define WNN_PORT_IN    (0x5701)
  26  static char *sockname = "/tmp/jd_sockV4";       /* for jserver */
  27 -# define LANG_NAME      "ja_JP"
  28 +# define LANG_NAME      "ja"
  29  # define SERVERNAME     "wnn4"
  30  # define MESSAGE_FILE   "jserver.msg"
  31  #else /* JAPANESE */
  32 @@ -88,7 +88,7 @@ static char *sockname = "/tmp/kd_sockV4"
  33
  34  # define WNN_PORT_IN    (0x5701)
  35  static char *sockname = "/tmp/jd_sockV4";       /* for jserver */
  36 -# define LANG_NAME      "ja_JP"
  37 +# define LANG_NAME      "ja"
  38  # define SERVERNAME     "wnn4"
  39  # define MESSAGE_FILE   "jserver.msg"
  40  #endif /* KOREAN */
  41 diff -urNp -x '*.orig' FreeWnn-1.1.1-a023.org/Wnn/include/jslib.h FreeWnn-1.1.1-a023/Wnn/include/jslib.h
  42 --- FreeWnn-1.1.1-a023.org/Wnn/include/jslib.h  2013-09-02 13:01:39.000000000 +0200
  43 +++ FreeWnn-1.1.1-a023/Wnn/include/jslib.h      2023-02-02 20:00:10.683168707 +0100
  44 @@ -412,8 +412,8 @@ struct wnn_file_head
  45  /*
  46    JSLIB function declaration
  47  */
  48 -#define js_open(server, timeout)        js_open_lang(server, "ja_JP", timeout)
  49 -#define js_connect(server,env_name)     js_connect_lang(server, env_name, "ja_JP")
  50 +#define js_open(server, timeout)        js_open_lang(server, "ja", timeout)
  51 +#define js_connect(server,env_name)     js_connect_lang(server, env_name, "ja")
  52
  53
  54  extern WNN_JSERVER_ID *js_open_lang FRWNN_PARAMS((const register char *server, const register char *lang, register int timeout));
  55 diff -urNp -x '*.orig' FreeWnn-1.1.1-a023.org/Wnn/include/msg.h FreeWnn-1.1.1-a023/Wnn/include/msg.h
  56 --- FreeWnn-1.1.1-a023.org/Wnn/include/msg.h    2013-09-02 13:01:39.000000000 +0200
  57 +++ FreeWnn-1.1.1-a023/Wnn/include/msg.h        2023-02-02 20:00:10.683168707 +0100
  58 @@ -62,7 +62,7 @@ struct msg_cat
  59  /*
  60  #define DEF_LANG "C"
  61  */
  62 -#define DEF_LANG "ja_JP"
  63 +#define DEF_LANG "ja"
  64
  65  #if __STDC__
  66  #define FRWNN_PARAMS(paramlist)        paramlist
  67 diff -urNp -x '*.orig' FreeWnn-1.1.1-a023.org/Wnn/include/wnn_config.h FreeWnn-1.1.1-a023/Wnn/include/wnn_config.h
  68 --- FreeWnn-1.1.1-a023.org/Wnn/include/wnn_config.h     2005-04-10 17:26:37.000000000 +0200
  69 +++ FreeWnn-1.1.1-a023/Wnn/include/wnn_config.h 2023-02-02 20:00:10.683168707 +0100
  70 @@ -44,7 +44,7 @@
  71  #define WNN_CSERVER_ENV         "CSERVER"
  72  #define WNN_KSERVER_ENV         "KSERVER"
  73  #define WNN_TSERVER_ENV         "TSERVER"
  74 -#define WNN_J_LANG              "ja_JP"
  75 +#define WNN_J_LANG              "ja"
  76  #define WNN_C_LANG              "zh_CN"
  77  #define WNN_K_LANG              "ko_KR"
  78  #define WNN_T_LANG              "zh_TW"
  79 @@ -79,7 +79,7 @@
  80  /* for jserver */
  81  #ifndef SERVER_INIT_FILE
  82  # ifdef JAPANESE
  83 -#  define SERVER_INIT_FILE      "/ja_JP/jserverrc"
  84 +#  define SERVER_INIT_FILE      "/ja/jserverrc"
  85  # else /* JAPANESE */
  86  # ifdef CHINESE
  87  # ifdef TAIWANESE
  88 @@ -91,7 +91,7 @@
  89  # ifdef KOREAN
  90  #  define SERVER_INIT_FILE      "/ko_KR/kserverrc"
  91  # else /* KOREAN */
  92 -#  define SERVER_INIT_FILE      "/ja_JP/jserverrc"      /* Default */
  93 +#  define SERVER_INIT_FILE      "/ja/jserverrc"      /* Default */
  94  # endif /* KOREAN */
  95  # endif /* CHINESE */
  96  # endif /* JAPANESE */
  97 @@ -109,7 +109,7 @@
  98
  99  #define ENVRCFILE               "/wnnenvrc"
 100  #ifndef HINSIDATA_FILE
 101 -# define HINSIDATA_FILE         "/ja_JP/hinsi.data"
 102 +# define HINSIDATA_FILE         "/ja/hinsi.data"
 103  #endif /* HINSIDATA_FILE */
 104
 105  #define USR_DIC_DIR_VAR "@USR"
 106 diff -urNp -x '*.orig' FreeWnn-1.1.1-a023.org/Wnn/jd/serverdefs FreeWnn-1.1.1-a023/Wnn/jd/serverdefs
 107 --- FreeWnn-1.1.1-a023.org/Wnn/jd/serverdefs    2001-06-14 19:55:32.000000000 +0200
 108 +++ FreeWnn-1.1.1-a023/Wnn/jd/serverdefs        2023-02-02 20:00:10.683168707 +0100
 109 @@ -30,7 +30,7 @@
 110  ;
 111
 112  ;lang_name     machine_name    unix_domain_socket_name service_name    port_num
 113 -ja_JP          jserver         /tmp/jd_sockV4          wnn4            22273
 114 +ja             jserver         /tmp/jd_sockV4          wnn4            22273
 115  japanese       jserver         /tmp/jd_sockV4          wnn4            22273
 116  nihongo                jserver         /tmp/jd_sockV4          wnn4            22273
 117  zh_CN          cserver         /tmp/cd_sockV4          wnn4_Cn         22289
 118 diff -urNp -x '*.orig' FreeWnn-1.1.1-a023.org/Wnn/jlib/jl.c FreeWnn-1.1.1-a023/Wnn/jlib/jl.c
 119 --- FreeWnn-1.1.1-a023.org/Wnn/jlib/jl.c        2015-05-10 03:39:27.000000000 +0200
 120 +++ FreeWnn-1.1.1-a023/Wnn/jlib/jl.c    2023-02-02 20:00:10.686502040 +0100
 121 @@ -460,7 +460,7 @@ jl_connect_lang (env_n, server_n, lang,
 122    if (!lang || !*lang)
 123      {
 124  /* Sorry! Default is Japanese. :-) */
 125 -      strcpy (p_lang, "ja_JP");
 126 +      strcpy (p_lang, "ja");
 127      }
 128    else
 129      {