Skip to content

Commit

Permalink
close #148 message files converted to the local encoding on the fly
Browse files Browse the repository at this point in the history
  • Loading branch information
zsiki committed Jul 4, 2021
1 parent 2d37346 commit d943aad
Show file tree
Hide file tree
Showing 10 changed files with 2,434 additions and 2,434 deletions.
4 changes: 2 additions & 2 deletions src/geo_easy.tcl
Expand Up @@ -253,11 +253,11 @@ proc GeoEasy {top} {
exit 0
}

# GeoEasy & ComEasy message file
# GeoEasy & ComEasy message files
foreach name [list geo_easy com_easy] {
set msgFile [file join $home i18n $name.$geoLang]
if {[file isfile $msgFile] && [file readable $msgFile]} {
if {[catch {source $msgFile} msg] == 1} {
if {[catch {source -encoding utf-8 $msgFile} msg] == 1} {
tk_dialog .msg "Error" "Error in message file:\n$msg" error 0 OK
exit
}
Expand Down
94 changes: 47 additions & 47 deletions src/i18n/com_easy.cze
Expand Up @@ -20,81 +20,81 @@ set comTypes {
{"TopCon GTS-210" {.210}}
{"Trimble M5" {.m5}}
{"Nikon DTM-300" {.nik}}
{"Geodat 124 form�tum" {.dat}}
{"Geodat 124 formátum" {.dat}}
{"All files" {.*}}
}

# window titles
set comEasyMsg(comTitle) "ComEasy V1.0"
set comEasyMsg(digikom) "Sponzor DigiKom Ltd."
set comEasyMsg(about1) "S�riov� Komunikace"
set comEasyMsg(about2) "Pro Zem�m��i�e"
set comEasyMsg(parsTitle) "Komunika�n� Parametry"
set comEasyMsg(about1) "Sériová Komunikace"
set comEasyMsg(about2) "Pro Zeměměřiče"
set comEasyMsg(parsTitle) "Komunikační Parametry"
set comEasyMsg(error) "Chyba"

# menu text
set comEasyMsg(mComFile) "P��kazy"
set comEasyMsg(mComPars) "Nastaven� ..."
set comEasyMsg(mComDir) "Adres��"
set comEasyMsg(mComDownload) "St�hnout ..."
set comEasyMsg(mComUpload) "Nahr�t ..."
set comEasyMsg(mComStop) "P�eru�it"
set comEasyMsg(mComFile) "Příkazy"
set comEasyMsg(mComPars) "Nastavení ..."
set comEasyMsg(mComDir) "Adresář"
set comEasyMsg(mComDownload) "Stáhnout ..."
set comEasyMsg(mComUpload) "Nahrát ..."
set comEasyMsg(mComStop) "Přerušit"
set comEasyMsg(mComExit) "Konec"
set comEasyMsg(mComHelp) "N�pov�da"
set comEasyMsg(mComHelp1) "N�pov�da ..."
set comEasyMsg(mComHelp) "Nápověda"
set comEasyMsg(mComHelp1) "Nápověda ..."
set comEasyMsg(mComAbout) "O programu ..."
set comEasyMsg(mComStored) "Ulo�en� parametry"
set comEasyMsg(mComStored) "Uložené parametry"
set comEasyMsg(mComPrint) "Tisk"
set comEasyMsg(mComPrintSelection) "Tisk v�b�ru"
set comEasyMsg(mComPrintSelection) "Tisk výběru"

# label text
set comEasyMsg(parsHead1) "Parametry ��dku"
set comEasyMsg(parsHead2) "Komunika�n� parametry"
set comEasyMsg(parsHead3) "Ostatn� parametry"
set comEasyMsg(parsHead1) "Parametry řádku"
set comEasyMsg(parsHead2) "Komunikační parametry"
set comEasyMsg(parsHead3) "Ostatní parametry"

set comEasyMsg(parsPort) "Kan�l:"
set comEasyMsg(parsPort) "Kanál:"
set comEasyMsg(parsBaud) "Rychlost:"
set comEasyMsg(parsParity) "Parita:"
set comEasyMsg(parsData) "Datov� bity:"
set comEasyMsg(parsData) "Datové bity:"
set comEasyMsg(parsStop) "Stop bity:"
set comEasyMsg(parsEofchar) "EOF ukazatel:"

set comEasyMsg(parsBlocking) "Blokov�n�:"
set comEasyMsg(parsBlocking) "Blokování:"
set comEasyMsg(parsTranslation) "EOL ukazatel:"
set comEasyMsg(parsBuffering) "Na��t�n�:"
set comEasyMsg(parsBuffsize) "Velikost vyrovn�vac� pam�ti:"
set comEasyMsg(parsEncoding) "K�dov� str�nka:"
set comEasyMsg(parsInit) "Po��te�n� sekvence:"
set comEasyMsg(parsQuery) "Z�znam dotazu:"
set comEasyMsg(parsSendquery) "Konec z�znamu:"
set comEasyMsg(parsDir) "Adres��:"
set comEasyMsg(parsBuffering) "Načítání:"
set comEasyMsg(parsBuffsize) "Velikost vyrovnávací paměti:"
set comEasyMsg(parsEncoding) "Kódová stránka:"
set comEasyMsg(parsInit) "Počáteční sekvence:"
set comEasyMsg(parsQuery) "Záznam dotazu:"
set comEasyMsg(parsSendquery) "Konec záznamu:"
set comEasyMsg(parsDir) "Adresář:"

# button labels
set comEasyMsg(ok) "OK"
set comEasyMsg(cancel) "Zruit"
set comEasyMsg(save) "Uloit"
set comEasyMsg(load) "Na��dt"
set comEasyMsg(cancel) "Zrušit"
set comEasyMsg(save) "Uložit"
set comEasyMsg(load) "Načídt"

# error messages
set comEasyMsg(warning) "Varov�n�"
set comEasyMsg(helpfile) "Soubor n�pov�dy nebyl nalezen"
set comEasyMsg(browser) "N�pov�du nelze zobrazit\nzaregistrujte sv�j html prohl�e� k otev�en� .html soubor� "
set comEasyMsg(warning) "Varování"
set comEasyMsg(helpfile) "Soubor nápovědy nebyl nalezen"
set comEasyMsg(browser) "Nápovědu nelze zobrazit\nzaregistrujte svůj html prohlížeš k otevření .html souborů "
set comEasyMsg(gizidll) "Chyba instalace code=1"
set comEasyMsg(comOpen) "Chyba p�i otev�r�n� kan�lu"
set comEasyMsg(comConfigure) "Chyba p�i konfiguraci kan�lu"
set comEasyMsg(cantSave) "Chyba otev�en� souboru pro z�pis"
set comEasyMsg(cantOpen) "Chyba otev�en� souboru pro �ten�"
set comEasyMsg(cantSource) "Chyba p�i na��t�n� souboru parametr�"
set comEasyMsg(cantRead) "Chyba p�i �ten� kan�lu"
set comEasyMsg(cantWrite) "Chyba z�pisu kan�lu"
set comEasyMsg(cantFRead) "Chyba p�i �ten� souboru"
set comEasyMsg(cantFWrite) "Chyba p�i psan� souboru"
set comEasyMsg(noBlocking) "Blokov�n� komunikace nen� dosud k dispozici"
set comEasyMsg(comOpen) "Chyba při otevírání kanálu"
set comEasyMsg(comConfigure) "Chyba při konfiguraci kanálu"
set comEasyMsg(cantSave) "Chyba otevření souboru pro zápis"
set comEasyMsg(cantOpen) "Chyba otevření souboru pro čtení"
set comEasyMsg(cantSource) "Chyba při načítání souboru parametrů"
set comEasyMsg(cantRead) "Chyba při čtení kanálu"
set comEasyMsg(cantWrite) "Chyba zápisu kanálu"
set comEasyMsg(cantFRead) "Chyba při čtení souboru"
set comEasyMsg(cantFWrite) "Chyba při psaní souboru"
set comEasyMsg(noBlocking) "Blokování komunikace není dosud k dispozici"

# info messages
set comEasyMsg(waiting) "�ek�n� na data ... (pro zastaven� stiskn�te Ctrl-Z)"
set comEasyMsg(comClose) "Komunika�n� kan�l zav�en"
set comEasyMsg(comFClose) "Soibor zav�en"
set comEasyMsg(waiting) "Čekání na data ... (pro zastavení stiskněte Ctrl-Z)"
set comEasyMsg(comClose) "Komunikační kanál zavřen"
set comEasyMsg(comFClose) "Soibor zavřen"
set comEasyMsg(eof) "Konec souboru"
set comEasyMsg(loadgizi) "Na��st data do GeoEasy?"
set comEasyMsg(loadgizi) "Načíst data do GeoEasy?"
set comEasyMsg(separator) "---------------------"
200 changes: 100 additions & 100 deletions src/i18n/com_easy.eng
@@ -1,100 +1,100 @@
#-------------------------------------------------------------------------------
# -- ComEasy message file
#-------------------------------------------------------------------------------
global comEasyMsg
global fileTypes
global comTypes
global comSetTypes
# saved Communication Parameters
set comSetTypes {{"ComEasy parameters" {.com}}}
# accepted file types for download
set comTypes {
{"Geodimeter JOB" {.job}}
{"Geodimeter ARE" {.are}}
{"Sokkia set 4" {.scr}}
{"Sokkia sdr" {.sdr}}
{"Leica GSI" {.gsi}}
{"TopCon GTS-700" {.700}}
{"TopCon GTS-210" {.210}}
{"Trimble M5" {.m5}}
{"Nikon DTM-300" {.nik}}
{"Geodat 124 form�tum" {.dat}}
{"All files" {.*}}
}
# window titles
set comEasyMsg(comTitle) "ComEasy V1.0"
set comEasyMsg(digikom) "Sponsor DigiKom Ltd."
set comEasyMsg(about1) "Serial Communication"
set comEasyMsg(about2) "For Land Surveyors"
set comEasyMsg(parsTitle) "Communication Parameters"
set comEasyMsg(error) "Error"
# menu text
set comEasyMsg(mComFile) "Commands"
set comEasyMsg(mComPars) "Settings ..."
set comEasyMsg(mComDir) "Directory"
set comEasyMsg(mComDownload) "Download ..."
set comEasyMsg(mComUpload) "Upload ..."
set comEasyMsg(mComStop) "Abort"
set comEasyMsg(mComExit) "Exit"
set comEasyMsg(mComHelp) "Help"
set comEasyMsg(mComHelp1) "Help ..."
set comEasyMsg(mComAbout) "About ..."
set comEasyMsg(mComStored) "Stored Parameters"
set comEasyMsg(mComPrint) "Print"
set comEasyMsg(mComPrintSelection) "Print Selection"
# label text
set comEasyMsg(parsHead1) "Line Parameters"
set comEasyMsg(parsHead2) "Communication Parameters"
set comEasyMsg(parsHead3) "Other Parameters"
set comEasyMsg(parsPort) "Chanel:"
set comEasyMsg(parsBaud) "Speed:"
set comEasyMsg(parsParity) "Parity:"
set comEasyMsg(parsData) "Data bits:"
set comEasyMsg(parsStop) "Stop bits:"
set comEasyMsg(parsEofchar) "EOF marker:"
set comEasyMsg(parsBlocking) "Blocking:"
set comEasyMsg(parsTranslation) "EOL marker:"
set comEasyMsg(parsBuffering) "Buffering:"
set comEasyMsg(parsBuffsize) "Buffer size:"
set comEasyMsg(parsEncoding) "Code page:"
set comEasyMsg(parsInit) "Initial sequence:"
set comEasyMsg(parsQuery) "Query record:"
set comEasyMsg(parsSendquery) "Record end:"
set comEasyMsg(parsDir) "Directory:"
# button labels
set comEasyMsg(ok) "OK"
set comEasyMsg(cancel) "Cancel"
set comEasyMsg(save) "Save"
set comEasyMsg(load) "Load"
# error messages
set comEasyMsg(warning) "warning"
set comEasyMsg(helpfile) "Help file not found"
set comEasyMsg(browser) "Help cannot be displayed\nregister your word html browser to open .html files"
set comEasyMsg(gizidll) "Setup error code=1"
set comEasyMsg(comOpen) "Error opening chanel"
set comEasyMsg(comConfigure) "Error configuring chanel"
set comEasyMsg(cantSave) "Error opening file for write"
set comEasyMsg(cantOpen) "Error opening file for read"
set comEasyMsg(cantSource) "Error loading parameter file"
set comEasyMsg(cantRead) "Error reading chanel"
set comEasyMsg(cantWrite) "Error writing chanel"
set comEasyMsg(cantFRead) "Error reading file"
set comEasyMsg(cantFWrite) "Error writing file"
set comEasyMsg(noBlocking) "Blocking communication not available yet"
# info messages
set comEasyMsg(waiting) "Waiting for data ... (press Ctrl-Z to stop)"
set comEasyMsg(comClose) "Communication chanel closed"
set comEasyMsg(comFClose) "File closed"
set comEasyMsg(eof) "End of file"
set comEasyMsg(loadgizi) "Load data to GeoEasy?"
set comEasyMsg(separator) "---------------------"
#-------------------------------------------------------------------------------
# -- ComEasy message file
#-------------------------------------------------------------------------------
global comEasyMsg
global fileTypes
global comTypes
global comSetTypes

# saved Communication Parameters
set comSetTypes {{"ComEasy parameters" {.com}}}

# accepted file types for download
set comTypes {
{"Geodimeter JOB" {.job}}
{"Geodimeter ARE" {.are}}
{"Sokkia set 4" {.scr}}
{"Sokkia sdr" {.sdr}}
{"Leica GSI" {.gsi}}
{"TopCon GTS-700" {.700}}
{"TopCon GTS-210" {.210}}
{"Trimble M5" {.m5}}
{"Nikon DTM-300" {.nik}}
{"Geodat 124 formátum" {.dat}}
{"All files" {.*}}
}

# window titles
set comEasyMsg(comTitle) "ComEasy V1.0"
set comEasyMsg(digikom) "Sponsor DigiKom Ltd."
set comEasyMsg(about1) "Serial Communication"
set comEasyMsg(about2) "For Land Surveyors"
set comEasyMsg(parsTitle) "Communication Parameters"
set comEasyMsg(error) "Error"

# menu text
set comEasyMsg(mComFile) "Commands"
set comEasyMsg(mComPars) "Settings ..."
set comEasyMsg(mComDir) "Directory"
set comEasyMsg(mComDownload) "Download ..."
set comEasyMsg(mComUpload) "Upload ..."
set comEasyMsg(mComStop) "Abort"
set comEasyMsg(mComExit) "Exit"
set comEasyMsg(mComHelp) "Help"
set comEasyMsg(mComHelp1) "Help ..."
set comEasyMsg(mComAbout) "About ..."
set comEasyMsg(mComStored) "Stored Parameters"
set comEasyMsg(mComPrint) "Print"
set comEasyMsg(mComPrintSelection) "Print Selection"

# label text
set comEasyMsg(parsHead1) "Line Parameters"
set comEasyMsg(parsHead2) "Communication Parameters"
set comEasyMsg(parsHead3) "Other Parameters"

set comEasyMsg(parsPort) "Chanel:"
set comEasyMsg(parsBaud) "Speed:"
set comEasyMsg(parsParity) "Parity:"
set comEasyMsg(parsData) "Data bits:"
set comEasyMsg(parsStop) "Stop bits:"
set comEasyMsg(parsEofchar) "EOF marker:"

set comEasyMsg(parsBlocking) "Blocking:"
set comEasyMsg(parsTranslation) "EOL marker:"
set comEasyMsg(parsBuffering) "Buffering:"
set comEasyMsg(parsBuffsize) "Buffer size:"
set comEasyMsg(parsEncoding) "Code page:"
set comEasyMsg(parsInit) "Initial sequence:"
set comEasyMsg(parsQuery) "Query record:"
set comEasyMsg(parsSendquery) "Record end:"
set comEasyMsg(parsDir) "Directory:"

# button labels
set comEasyMsg(ok) "OK"
set comEasyMsg(cancel) "Cancel"
set comEasyMsg(save) "Save"
set comEasyMsg(load) "Load"

# error messages
set comEasyMsg(warning) "warning"
set comEasyMsg(helpfile) "Help file not found"
set comEasyMsg(browser) "Help cannot be displayed\nregister your word html browser to open .html files"
set comEasyMsg(gizidll) "Setup error code=1"
set comEasyMsg(comOpen) "Error opening chanel"
set comEasyMsg(comConfigure) "Error configuring chanel"
set comEasyMsg(cantSave) "Error opening file for write"
set comEasyMsg(cantOpen) "Error opening file for read"
set comEasyMsg(cantSource) "Error loading parameter file"
set comEasyMsg(cantRead) "Error reading chanel"
set comEasyMsg(cantWrite) "Error writing chanel"
set comEasyMsg(cantFRead) "Error reading file"
set comEasyMsg(cantFWrite) "Error writing file"
set comEasyMsg(noBlocking) "Blocking communication not available yet"

# info messages
set comEasyMsg(waiting) "Waiting for data ... (press Ctrl-Z to stop)"
set comEasyMsg(comClose) "Communication chanel closed"
set comEasyMsg(comFClose) "File closed"
set comEasyMsg(eof) "End of file"
set comEasyMsg(loadgizi) "Load data to GeoEasy?"
set comEasyMsg(separator) "---------------------"
2 changes: 1 addition & 1 deletion src/i18n/com_easy.ger
Expand Up @@ -20,7 +20,7 @@ set comTypes {
{"TopCon GTS-210" {.210}}
{"Trimble M5" {.m5}}
{"Nikon DTM-300" {.nik}}
{"Geodat 124 form�tum" {.dat}}
{"Geodat 124 formátum" {.dat}}
{"All files" {.*}}
}

Expand Down

0 comments on commit d943aad

Please sign in to comment.