Changeset 771

Timestamp:

Apr 25, 2013, 7:57:13 AM (12 years ago)

Author:

Herwig Bauernfeind

Message:

GUI-Tools: SSCC 1.0.x warn if USER and HOSTNAME have the same value (which is nonsense anyway) (Ticket #220)

Location:

trunk/guitools

Files:

• smbmon/readme.smbmon (modified) (1 diff)
• sscc/mkmsg.cmd (modified) (1 diff)
• sscc/rc/lang/sscc_de.mkm (modified) (1 diff)
• sscc/rc/lang/sscc_en.mkm (modified) (1 diff)
• sscc/rc/lang/sscc_es.mkm (modified) (1 diff)
• sscc/rc/lang/sscc_fr.mkm (modified) (1 diff)
• sscc/rc/lang/sscc_sv.mkm (modified) (1 diff)
• sscc/sscc.vrp (modified) (1 diff)
• sscc/sscc.vrx (modified) (1 diff)
• sscc/sscc.vry (modified) ( previous)

trunk/guitools/smbmon/readme.smbmon

@@ -78 +78 @@
 4. Author:
 ----------
-Herwig Bauernfeind, xx-xx-2011
-email: herwig.bauernfeind@aon.at
+Herwig Bauernfeind, 
+email: herwig.bauernfeind@bitwiseworks.com

trunk/guitools/sscc/mkmsg.cmd

@@ -1 @@
-rem Edit alle files
-edit .\rc\lang\sscc_de.mkm
-edit .\rc\lang\sscc_en.mkm
-edit .\rc\lang\sscc_sv.mkm
-edit .\rc\lang\sscc_fr.mkm
-edit .\rc\lang\sscc_es.mkm
+rem call edit alle files
+call edit .\rc\lang\sscc_de.mkm
+call edit .\rc\lang\sscc_en.mkm
+call edit .\rc\lang\sscc_sv.mkm
+call edit .\rc\lang\sscc_fr.mkm
+call edit .\rc\lang\sscc_es.mkm
 rem make message files
 mkmsgf .\rc\lang\sscc_de.mkm sscc_de.msg

trunk/guitools/sscc/rc/lang/sscc_de.mkm

@@ -124 +124 @@
 SSC0116I: Zuwenig freier Platz auf "%1"!
 SSC0117I: Achtung! System l„uft nicht auf Codepage 850, bitte Zeichenbersetzung berprfen!
+SSC0118I: USER und HOSTNAME sollten nicht denselben Wert (%1) haben!

trunk/guitools/sscc/rc/lang/sscc_en.mkm

@@ -124 +124 @@
 SSC0116I: Free space low on "%1"!
 SSC0117I: Warning! System is not using codepage 850, please check whether character translation really works!
+SSC0118I: USER and HOSTNAME should not have the same value (%1)!
+

trunk/guitools/sscc/rc/lang/sscc_es.mkm

@@ -124 +124 @@
 SSC0116I: Espacio libre de bajo en "% 1"!
 SSC0117I: ­Advertencia! El sistema no utiliza p gina de c¢digos 850, compruebe si la traducci¢n de caracteres realmente funciona!
+SSC0118I: USER y HOSTNAME ne deben tener el mismo valor (%1)!
+

trunk/guitools/sscc/rc/lang/sscc_fr.mkm

@@ -132 +132 @@
 SSC0116I: D'espace libre sur "%1" est faible !
 SSC0117I: Attention! SystŠme n'utilise pas codepage 850, s'il vous plaŒt v‚rifier si la traduction de caractŠres fonctionne vraiment!
+SSC0118I: USER et HOSTNAME ne doivent pas avoir le mˆme valeur (%1)!
+

trunk/guitools/sscc/rc/lang/sscc_sv.mkm

@@ -124 +124 @@
 SSC0116I: Fritt utrymme p† "%1" „r l†g!
 SSC0117I: Varning! Systemet inte anv„nder codepage 850, v„nligen kontrollera om karakt„r ”vers„ttning verkligen fungerar!
+SSC0118I: USER och HOSTNAME b”r inte ha samma v„rde (%1)!
+

trunk/guitools/sscc/sscc.vrp

@@ -11 +11 @@
 UserFile: 1
 UserWindow: Main,1
+UserWindow: Installer,1

trunk/guitools/sscc/sscc.vrx

@@ -863 +863 @@
 */
 _SambaUserCreate: 
-    eCSUser = value("USER",,"OS2ENVIRONMENT")
+    eCSUser  = value("USER",,"OS2ENVIRONMENT")
+    HostName = value("HOSTNAME",,"OS2ENVIRONMENT")
+    if translate(eCSUser) = translate(Hostname) then do
+        Msg.Text = NLVGetMessage(118, eCSUser)
+        Msg.Type = "I"
+        call _ShowMsg
+    end
     if translate(eCSUser) <> "root" & translate(eCSUser) <> "guest" then do
         Msg.Text = NLVGetMessage(75, eCSUser)