Commit c65ee6f4 authored by ROOL's avatar ROOL 🤖
Browse files

Internationalisation and terminology changes

Detail:
  When generating the encoding menu the terms "Default" and "UTF8" were looked up via the Messages file, however the selection logic and update of the display field used hardwired English. Now, the internal variables Alphabet$ and Encoding$ are English but when required for display are always looked up.
  Now that works, use the preferred term "UTF-8" per Unicode consortium and Style Guide page 133.
Admin:
  From review of User Guide chapter.

Version 2.02. Tagged as 'Chars-2_02'
parent f05f81c7
......@@ -2,15 +2,13 @@
_TaskName:Characters
_Version:Filled at build time
SysFont:System Font
Unicode:Unicode
Encs:Encodings
Cats:Categories
Default:Default
UTF8:UTF8
UTF8:UTF-8
UCode:U+%0 %1
UTrans: (Alt+
Char:Character &
Unknown:<Unknown>
# Desktop font options
DF1:System Font
......
......@@ -11,13 +11,13 @@
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "2.01"
Module_Version SETA 201
Module_MajorVersion SETS "2.02"
Module_Version SETA 202
Module_MinorVersion SETS ""
Module_Date SETS "30 Jul 2016"
Module_ApplicationDate SETS "30-Jul-16"
Module_Date SETS "27 Aug 2016"
Module_ApplicationDate SETS "27-Aug-16"
Module_ComponentName SETS "Chars"
Module_ComponentPath SETS "castle/RiscOS/Sources/Apps/Chars"
Module_FullVersion SETS "2.01"
Module_HelpVersion SETS "2.01 (30 Jul 2016)"
Module_FullVersion SETS "2.02"
Module_HelpVersion SETS "2.02 (27 Aug 2016)"
END
/* (2.01)
/* (2.02)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 2.01
#define Module_MajorVersion_CMHG 2.02
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 30 Jul 2016
#define Module_Date_CMHG 27 Aug 2016
#define Module_MajorVersion "2.01"
#define Module_Version 201
#define Module_MajorVersion "2.02"
#define Module_Version 202
#define Module_MinorVersion ""
#define Module_Date "30 Jul 2016"
#define Module_Date "27 Aug 2016"
#define Module_ApplicationDate "30-Jul-16"
#define Module_ApplicationDate "27-Aug-16"
#define Module_ComponentName "Chars"
#define Module_ComponentPath "castle/RiscOS/Sources/Apps/Chars"
#define Module_FullVersion "2.01"
#define Module_HelpVersion "2.01 (30 Jul 2016)"
#define Module_LibraryVersionInfo "2:1"
#define Module_FullVersion "2.02"
#define Module_HelpVersion "2.02 (27 Aug 2016)"
#define Module_LibraryVersionInfo "2:2"
......@@ -526,6 +526,7 @@ IF UCSManager% THEN
ENDIF
SYS "Wimp_DecodeMenu",,EncMenu%,Block%,EncodingBuff%
Encoding$=$(EncodingBuff%)
IF Encoding$=FNmsg_get("UTF8") THEN Encoding$="UTF8"
IF Encoding$=FNmsg_get("Default") THEN
IF UCSManager% THEN
Encoding$="Glyph":e$="\E"+Encoding$
......@@ -711,13 +712,17 @@ CASE Encoding$ OF
PROCwimp_shadeicon(CharsWin%,9,FALSE)
PROCwimp_shadeicon(CharsWin%,2,FALSE)
PROCwimp_shadeicon(CharsWin%,3,FALSE)
PROCwimp_seticontext(CharsWin%,2,Encoding$)
PROCwimp_seticontext(CharsWin%,2,FNmsg_get("UTF8"))
PROCwimp_shadeicon(CharsWin%,4,FALSE)
PROCwimp_shadeicon(CharsWin%,5,FALSE)
PROCwimp_shadeicon(CharsWin%,10,FALSE)
PROCwimp_seticontext(CharsWin%,4,Category$)
OTHERWISE:
IF Encoding$="Glyph" THEN e$="Default" ELSE e$=Encoding$
IF Encoding$="Glyph" OR Encoding$="Default" THEN
e$=FNmsg_get("Default")
ELSE
e$=Encoding$
ENDIF
PROCwimp_shadeicon(CharsWin%,9,FALSE)
PROCwimp_shadeicon(CharsWin%,2,FALSE)
PROCwimp_shadeicon(CharsWin%,3,FALSE)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment