Skip to content

Commit 4b92ba2

Browse files
author
Rubens F. N. da Silva
committed
Dictionary and wizard fixes
* Fixes an issue with wrong menu numeration. * Fixes an issue regarding a deadlock when attempting to exit the wizard.
1 parent 1e2c389 commit 4b92ba2

File tree

4 files changed

+17
-9
lines changed

4 files changed

+17
-9
lines changed

‎cls/Port/Installer.cls‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ XData LocaleEN [ XMLNamespace = "https://github.com/rfns/port" ]
163163
<Message Id="-7404" Name="PCWSetLogLevelStatusPrompt">Please set the log verbosity level (type the number): </Message>
164164
<Message Id="-7410" Name="PCWSetLogLevelStatusChoice1">1. Level 1: Displays item enqueieing, import categories, backup notifications, repository status and error messages.</Message>
165165
<Message Id="-7420" Name="PCWSetLogLevelStatusChoice2">2. Level 2: Includes all verbosity from Level 1 plus detailed logging about atomical operations.</Message>
166-
<Message Id="-7600" Name="PCWExit">6. Exit.</Message>
166+
<Message Id="-7600" Name="PCWExit">5. Exit.</Message>
167167
<Message Id="-7970" Name="PCWPlaceholdersAnnounce">You can use the following specific placeholders:</Message>
168168
<Message Id="-7971" Name="PCWPlaceholdersProject">{PROJECT} - The active project name.</Message>
169169
<Message Id="-7972" Name="PCWPlaceholdersNamespace">{NAMESPACE} - The active namespace name.</Message>
@@ -340,7 +340,7 @@ XData LocalePTBR [ XMLNamespace = "https://github.com/rnfs/port" ]
340340
<Message Id="-7404" Name="PCWSetLogLevelStatusPrompt">Por favor escolha o nível de verbosidade do log (digite o número): </Message>
341341
<Message Id="-7410" Name="PCWSetLogLevelStatusChoice1">1. Nível 1: Exibe enfileiramento, categorias de importação/exportação, notificações de backup, situação do espaço de trabalho e mensagens de erro.</Message>
342342
<Message Id="-7420" Name="PCWSetLogLevelStatusChoice2">2. Nível 2: Inclui toda a verbosidade do nível 1, substituindo categorias por notificações por item.</Message>
343-
<Message Id="-7600" Name="PCWExit">6. Sair.</Message>
343+
<Message Id="-7600" Name="PCWExit">5. Sair.</Message>
344344
<Message Id="-7970" Name="PCWPlaceholdersAnnounce">Você pode utilizar os seguinte marcadores:</Message>
345345
<Message Id="-7971" Name="PCWPlaceholdersProject">{PROJECT} - O nome do projeto ativo.</Message>
346346
<Message Id="-7972" Name="PCWPlaceholdersNamespace">{NAMESPACE} - O namespace ativo.</Message>

‎cls/Port/Wizard.cls‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Class Port.Wizard [ Abstract ]
55

66
ClassMethod Start(hideIntroduction As %Boolean = 0)
77
{
8-
set validChoices = $listbuild(1,2,3,4)
8+
set validChoices = $listbuild(1,2,3,4,5)
99
set invalidChoice = 1
1010
set choice = ""
1111

‎port-prod.xml‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -553,7 +553,7 @@ Returns the selected test format. It can be "UDL" or "XML".</Description>
553553
<Message Id="-7404" Name="PCWSetLogLevelStatusPrompt">Please set the log verbosity level (type the number): </Message>
554554
<Message Id="-7410" Name="PCWSetLogLevelStatusChoice1">1. Level 1: Displays item enqueieing, import categories, backup notifications, repository status and error messages.</Message>
555555
<Message Id="-7420" Name="PCWSetLogLevelStatusChoice2">2. Level 2: Includes all verbosity from Level 1 plus detailed logging about atomical operations.</Message>
556-
<Message Id="-7600" Name="PCWExit">6. Exit.</Message>
556+
<Message Id="-7600" Name="PCWExit">5. Exit.</Message>
557557
<Message Id="-7970" Name="PCWPlaceholdersAnnounce">You can use the following specific placeholders:</Message>
558558
<Message Id="-7971" Name="PCWPlaceholdersProject">{PROJECT} - The active project name.</Message>
559559
<Message Id="-7972" Name="PCWPlaceholdersNamespace">{NAMESPACE} - The active namespace name.</Message>
@@ -732,7 +732,7 @@ Returns the selected test format. It can be "UDL" or "XML".</Description>
732732
<Message Id="-7404" Name="PCWSetLogLevelStatusPrompt">Por favor escolha o nível de verbosidade do log (digite o número): </Message>
733733
<Message Id="-7410" Name="PCWSetLogLevelStatusChoice1">1. Nível 1: Exibe enfileiramento, categorias de importação/exportação, notificações de backup, situação do espaço de trabalho e mensagens de erro.</Message>
734734
<Message Id="-7420" Name="PCWSetLogLevelStatusChoice2">2. Nível 2: Inclui toda a verbosidade do nível 1, substituindo categorias por notificações por item.</Message>
735-
<Message Id="-7600" Name="PCWExit">6. Sair.</Message>
735+
<Message Id="-7600" Name="PCWExit">5. Sair.</Message>
736736
<Message Id="-7970" Name="PCWPlaceholdersAnnounce">Você pode utilizar os seguinte marcadores:</Message>
737737
<Message Id="-7971" Name="PCWPlaceholdersProject">{PROJECT} - O nome do projeto ativo.</Message>
738738
<Message Id="-7972" Name="PCWPlaceholdersNamespace">{NAMESPACE} - O namespace ativo.</Message>
@@ -1571,7 +1571,11 @@ The CSP application name is mirrored into subfolders inside the public folder.</
15711571
quit
15721572
}
15731573
1574+
set io = $$$GETIO
1575+
1576+
$$$SETIO(##class(Port.Configuration).GetPublicFileOutputTranslateTable())
15741577
set exported = ##class(%File).CopyFile(csp.Code.Filename, destination, 1)
1578+
$$$SETIO(io)
15751579
15761580
write ..LogLine($$$Done)
15771581
set ..AffectedCount = ..AffectedCount + 1
@@ -4127,7 +4131,7 @@ Use the isImport flag to invert the condition.</Description>
41274131
<ClassMethod>1</ClassMethod>
41284132
<FormalSpec>hideIntroduction:%Boolean=0</FormalSpec>
41294133
<Implementation><![CDATA[
4130-
set validChoices = $listbuild(1,2,3,4)
4134+
set validChoices = $listbuild(1,2,3,4,5)
41314135
set invalidChoice = 1
41324136
set choice = ""
41334137

‎port.xml‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -553,7 +553,7 @@ Returns the selected test format. It can be "UDL" or "XML".</Description>
553553
<Message Id="-7404" Name="PCWSetLogLevelStatusPrompt">Please set the log verbosity level (type the number): </Message>
554554
<Message Id="-7410" Name="PCWSetLogLevelStatusChoice1">1. Level 1: Displays item enqueieing, import categories, backup notifications, repository status and error messages.</Message>
555555
<Message Id="-7420" Name="PCWSetLogLevelStatusChoice2">2. Level 2: Includes all verbosity from Level 1 plus detailed logging about atomical operations.</Message>
556-
<Message Id="-7600" Name="PCWExit">6. Exit.</Message>
556+
<Message Id="-7600" Name="PCWExit">5. Exit.</Message>
557557
<Message Id="-7970" Name="PCWPlaceholdersAnnounce">You can use the following specific placeholders:</Message>
558558
<Message Id="-7971" Name="PCWPlaceholdersProject">{PROJECT} - The active project name.</Message>
559559
<Message Id="-7972" Name="PCWPlaceholdersNamespace">{NAMESPACE} - The active namespace name.</Message>
@@ -732,7 +732,7 @@ Returns the selected test format. It can be "UDL" or "XML".</Description>
732732
<Message Id="-7404" Name="PCWSetLogLevelStatusPrompt">Por favor escolha o nível de verbosidade do log (digite o número): </Message>
733733
<Message Id="-7410" Name="PCWSetLogLevelStatusChoice1">1. Nível 1: Exibe enfileiramento, categorias de importação/exportação, notificações de backup, situação do espaço de trabalho e mensagens de erro.</Message>
734734
<Message Id="-7420" Name="PCWSetLogLevelStatusChoice2">2. Nível 2: Inclui toda a verbosidade do nível 1, substituindo categorias por notificações por item.</Message>
735-
<Message Id="-7600" Name="PCWExit">6. Sair.</Message>
735+
<Message Id="-7600" Name="PCWExit">5. Sair.</Message>
736736
<Message Id="-7970" Name="PCWPlaceholdersAnnounce">Você pode utilizar os seguinte marcadores:</Message>
737737
<Message Id="-7971" Name="PCWPlaceholdersProject">{PROJECT} - O nome do projeto ativo.</Message>
738738
<Message Id="-7972" Name="PCWPlaceholdersNamespace">{NAMESPACE} - O namespace ativo.</Message>
@@ -1571,7 +1571,11 @@ The CSP application name is mirrored into subfolders inside the public folder.</
15711571
quit
15721572
}
15731573
1574+
set io = $$$GETIO
1575+
1576+
$$$SETIO(##class(Port.Configuration).GetPublicFileOutputTranslateTable())
15741577
set exported = ##class(%File).CopyFile(csp.Code.Filename, destination, 1)
1578+
$$$SETIO(io)
15751579
15761580
write ..LogLine($$$Done)
15771581
set ..AffectedCount = ..AffectedCount + 1
@@ -4127,7 +4131,7 @@ Use the isImport flag to invert the condition.</Description>
41274131
<ClassMethod>1</ClassMethod>
41284132
<FormalSpec>hideIntroduction:%Boolean=0</FormalSpec>
41294133
<Implementation><![CDATA[
4130-
set validChoices = $listbuild(1,2,3,4)
4134+
set validChoices = $listbuild(1,2,3,4,5)
41314135
set invalidChoice = 1
41324136
set choice = ""
41334137

0 commit comments

Comments
 (0)