Skip to content

Commit 1b51821

Browse files
nikitaeverywherenikitaeverywhere
committed
translation to russian (check settings), /sql, authorization, autocomplete fix
1 parent ee87412 commit 1b51821

File tree

9 files changed

+668
-277
lines changed

9 files changed

+668
-277
lines changed

‎%WebTerminal/Engine.cls.xml

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,26 @@ authorization.</Description>
99
<Super>%CSP.WebSocket,%Library.Routine</Super>
1010
<TimeCreated>63047,60359.445979</TimeCreated>
1111

12+
<UDLText name="T">
13+
<Content><![CDATA[
14+
// USER CONSTANTS START
15+
16+
]]></Content>
17+
</UDLText>
18+
19+
<Parameter name="authorizationTimeout">
20+
<Description>
21+
How long to wait for authorization key when connection established</Description>
22+
<Default>5</Default>
23+
</Parameter>
24+
25+
<UDLText name="T">
26+
<Content><![CDATA[
27+
// USER CONSTANTS END
28+
29+
]]></Content>
30+
</UDLText>
31+
1232
<Property name="SharedConnection">
1333
<Description><![CDATA[
1434
This property determines whether the communication between the client and WebSocket server should be over a dedicated Gateway
@@ -712,12 +732,12 @@ This method holds process and expects only one package from
712732
the client - it includes authorization key.</Description>
713733
<ReturnType>%Status</ReturnType>
714734
<Implementation><![CDATA[
715-
set key = ..Read(,.status,3) // wait for package
735+
set key = ..Read(,.status,..#authorizationTimeout) // wait for package
716736
set realKey = ..GetAuthKey() // remember current auth key
717737
do ..GenerateAuthKey() // generate new auth key
718738
719739
if (key = realKey) {
720-
quit $$$OK
740+
quit $$$OK
721741
}
722742
723743
quit $$$NOTOK
@@ -842,6 +862,7 @@ New connection established</Description>
842862
843863
use $io::("^" _ ..InitialZName)
844864
do ..ClientLoop()
865+
845866
} else {
846867
847868
do ..SendData("0", ..ConstClientAuthorizationStatus)

‎csp/webTerminal/index.csp.xml

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<html>
77
88
<head>
9-
<title>Remote Caché terminal</title>
9+
<title id="lang-field-15">Caché WEB Terminal</title>
1010
<meta charset="utf-8">
1111
<meta name="author" content="ZitRo - InterSystems">
1212
<meta name="Description" content="Web-based terminal for Cache administration.">
@@ -30,71 +30,71 @@
3030
<body>
3131
<div id="terminal-control-panel">
3232
<div class="terminal-control-content">
33-
<span id="terminal-control-closeButton" class="info">Close</span>
34-
<h1>Control panel</h1>
33+
<span id="terminal-control-closeButton" class="info"><span id="lang-field-0"></span></span>
34+
<h1 id="lang-field-1"></h1>
3535
<table id="terminal-control-table">
3636
<tbody>
3737
<tr>
38-
<td class="center" colspan="2">Application settings</td>
38+
<td class="center" colspan="2" id="lang-field-2"></td>
3939
</tr>
4040
<tr>
4141
<td>
4242
<input id="settings-highlighting" type="checkbox">
43-
<label for="settings-highlighting">
44-
Highlighting
43+
<label for="settings-highlighting" id="lang-field-3">
44+
4545
</label>
4646
</td>
47-
<td>
48-
Use syntax highlighting
47+
<td id="lang-field-4">
48+
4949
</td>
5050
</tr>
5151
<tr>
5252
<td>
5353
<input id="settings-parse-output" type="checkbox">
54-
<label for="settings-parse-output">
55-
Parse output
54+
<label for="settings-parse-output" id="lang-field-5">
55+
5656
</label>
5757
</td>
58-
<td>
59-
Highlighting terminal output data
58+
<td id="lang-field-6">
59+
6060
</td>
6161
</tr>
6262
<tr>
6363
<td>
6464
<input id="settings-cleanStartup" type="checkbox">
65-
<label for="settings-cleanStartup">
66-
Clean startup
65+
<label for="settings-cleanStartup" id="lang-field-7">
66+
6767
</label>
6868
</td>
69-
<td>
70-
Do not show additional information during terminal startup
69+
<td id="lang-field-8">
70+
7171
</td>
7272
</tr>
7373
<tr>
7474
<td>
7575
<input id="settings-animations" type="checkbox">
76-
<label for="settings-animations">
77-
Animations
76+
<label for="settings-animations" id="lang-field-9">
77+
7878
</label>
7979
</td>
80-
<td>
81-
Animate output and some of terminal elements
80+
<td id="lang-field-10">
81+
8282
</td>
8383
</tr>
8484
<tr>
8585
<td>
8686
<input id="settings-autosaving" type="checkbox">
87-
<label for="settings-autosaving">
88-
AutoSaving
87+
<label for="settings-autosaving" id="lang-field-11">
88+
8989
</label>
9090
</td>
91-
<td>
92-
Saves your history, favorites, definitions and autocompletion automatically after browser tab closed and loads it later.
91+
<td id="lang-field-12">
92+
9393
</td>
9494
</tr>
9595
<tr>
96-
<td>
97-
Language
96+
<td id="lang-field-13">
97+
9898
</td>
9999
<td>
100100
<label id="terminal-languages-container">
@@ -103,8 +103,8 @@
103103
</td>
104104
</tr>
105105
<tr>
106-
<td>
107-
Color theme
106+
<td id="lang-field-14">
107+
108108
</td>
109109
<td>
110110
<label id="terminal-themes-container">
@@ -139,7 +139,7 @@
139139
application.authorizationKey = "#(##Class(%WebTerminal.Engine).GetAuthKey())#";
140140
application.initialize();
141141
} catch (e) {
142-
alert("Unable to initialize terminal.");
142+
alert("Unable to initialize terminal: check console output.");
143143
console.log(e)
144144
}
145145
</script>

0 commit comments

Comments
 (0)