Skip to content

Commit d3a4b6a

Browse files
irlaecirlaec
authored
Correct string marking (#7)
* Correct string marking * Correct in German version
1 parent 1003c93 commit d3a4b6a

File tree

6 files changed

+33
-28
lines changed

6 files changed

+33
-28
lines changed

‎octoprint_netconnectd/static/js/netconnectd.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,15 +86,15 @@ $(function() {
8686

8787
self.connectionStateTextEthernet = ko.computed(function() {
8888
if (self.status.connections.wired()) {
89-
return gettext('Connected (IP: ') + self.status.ip_addresses.eth0() + ")";
89+
return _.sprintf(gettext("Connected (IP: %(ip)s)"), {ip: self.status.ip_addresses.eth0()});
9090
} else {
9191
return gettext("Not connected");
9292
}
9393
});
9494

9595
self.connectionStateTextWifi = ko.computed(function() {
9696
if (self.status.connections.ap()) {
97-
return gettext("Access point (IP: ") + self.status.ip_addresses.wlan0() + ")";
97+
return _.sprintf(gettext("Access point (IP: %(ip)s)"), {ip: self.status.ip_addresses.wlan0()});
9898
} else if (self.status.connections.wifi() && self.status.wifi.current_ssid()) {
9999
return _.sprintf(gettext("Connected to \"%(ssid)s\" (IP: %(ip)s)"), {ssid: self.status.wifi.current_ssid(), ip: self.status.ip_addresses.wlan0()});
100100
} else if (self.status.connections.wifi()) {

‎octoprint_netconnectd/translations/de/LC_MESSAGES/messages.mo‎

-268 Bytes
Binary file not shown.

‎octoprint_netconnectd/translations/de/LC_MESSAGES/messages.po‎

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: PROJECT VERSION\n"
99
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
10-
"POT-Creation-Date: 2019-06-14 18:17+0200\n"
11-
"PO-Revision-Date: 2019-07-12 13:58+0200\n"
10+
"POT-Creation-Date: 2019-07-12 15:46+0200\n"
11+
"PO-Revision-Date: 2019-07-12 16:03+0200\n"
12+
"Last-Translator: \n"
1213
"Language-Team: \n"
14+
"Language: de\n"
1315
"MIME-Version: 1.0\n"
1416
"Content-Type: text/plain; charset=UTF-8\n"
1517
"Content-Transfer-Encoding: 8bit\n"
1618
"Generated-By: Babel 2.6.0\n"
1719
"X-Generator: Poedit 2.2.3\n"
1820
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
19-
"Last-Translator: \n"
20-
"Language: de\n"
2121

2222
#: octoprint_netconnectd/__init__.py:63
2323
msgid "Network Connection"
@@ -57,16 +57,18 @@ msgid "no wifi interface present"
5757
msgstr "keine WLAN-Schnittstelle vorhanden"
5858

5959
#: octoprint_netconnectd/static/js/netconnectd.js:89
60-
msgid "Connected (IP: "
61-
msgstr "Verbunden (IP: "
60+
#, python-format
61+
msgid "Connected (IP: %(ip)s)"
62+
msgstr "Verbunden (IP: %(ip)s)"
6263

6364
#: octoprint_netconnectd/static/js/netconnectd.js:91
6465
msgid "Not connected"
6566
msgstr "Nicht verbunden"
6667

6768
#: octoprint_netconnectd/static/js/netconnectd.js:97
68-
msgid "Access point (IP: "
69-
msgstr "Access Point (IP: "
69+
#, python-format
70+
msgid "Access point (IP: %(ip)s)"
71+
msgstr "Access Point (IP: %(ip)s)"
7072

7173
#: octoprint_netconnectd/static/js/netconnectd.js:99
7274
#, python-format
@@ -114,11 +116,10 @@ msgid ""
114116
"OctoPrint manually because then I was unable to find it myself."
115117
msgstr ""
116118
"Mr Beam II wechselt nun zu Deinem konfigurierten WLAN und beendet damit den "
117-
"Access Point. Wir versuche laufend, ihn bei <strong>%(hostname)s</strong> "
118-
"zu erreichen, aber es kann eine Weile dauern. Wenn Du in den nächsten "
119-
"Minuten nicht wieder verbunden wirst, versuche bitte, Dich manuell mit Mr "
120-
"Beam II zu verbinden, da die automatische Verbindung dann wohl n nicht "
121-
"geklappt hat."
119+
"Access Point. Wir versuche laufend, ihn bei <strong>%(hostname)s</strong> zu "
120+
"erreichen, aber es kann eine Weile dauern. Wenn Du in den nächsten Minuten "
121+
"nicht wieder verbunden wirst, versuche bitte, Dich manuell mit Mr Beam II zu "
122+
"verbinden, da die automatische Verbindung dann wohl n nicht geklappt hat."
122123

123124
#: octoprint_netconnectd/static/js/netconnectd.js:326
124125
msgid "Reconnecting..."
@@ -219,8 +220,8 @@ msgstr "Abbrechen"
219220
msgid "Confirm"
220221
msgstr "Bitte bestätige, um fortzufahren."
221222

222-
msgid "\"Access point (IP: \" + self.status.ip_addresses.wlan0() + \")\""
223-
msgstr "“Access Point (IP: \" + self.status.ip_addresses.wlan0() + \")\""
223+
#~ msgid "\"Access point (IP: \" + self.status.ip_addresses.wlan0() + \")\""
224+
#~ msgstr "“Access Point (IP: \" + self.status.ip_addresses.wlan0() + \")\""
224225

225-
msgid "Connected (IP: \" + self.status.ip_addresses.eth0() + \")\""
226-
msgstr "Verbunden (IP: \" + self.status.ip_addresses.eth0() + \")\""
226+
#~ msgid "Connected (IP: \" + self.status.ip_addresses.eth0() + \")\""
227+
#~ msgstr "Verbunden (IP: \" + self.status.ip_addresses.eth0() + \")\""

‎octoprint_netconnectd/translations/es/LC_MESSAGES/messages.mo‎

28 Bytes
Binary file not shown.

‎octoprint_netconnectd/translations/es/LC_MESSAGES/messages.po‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: PROJECT VERSION\n"
99
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
10-
"POT-Creation-Date: 2019-06-14 18:17+0200\n"
11-
"PO-Revision-Date: 2019-06-14 18:18+0200\n"
10+
"POT-Creation-Date: 2019-07-12 15:46+0200\n"
11+
"PO-Revision-Date: 2019-07-12 15:47+0200\n"
1212
"Last-Translator: \n"
1313
"Language-Team: \n"
1414
"Language: es_ES\n"
@@ -59,16 +59,18 @@ msgid "no wifi interface present"
5959
msgstr "sin interfaz wifi presente"
6060

6161
#: octoprint_netconnectd/static/js/netconnectd.js:89
62-
msgid "Connected (IP: "
63-
msgstr "Conectado (IP: "
62+
#, python-format
63+
msgid "Connected (IP: %(ip)s)"
64+
msgstr "Conectado (IP: %(ip)s)"
6465

6566
#: octoprint_netconnectd/static/js/netconnectd.js:91
6667
msgid "Not connected"
6768
msgstr "Sin conexión"
6869

6970
#: octoprint_netconnectd/static/js/netconnectd.js:97
70-
msgid "Access point (IP: "
71-
msgstr "Punto de acceso (IP: "
71+
#, python-format
72+
msgid "Access point (IP: %(ip)s)"
73+
msgstr "Punto de acceso (IP: %(ip)s)"
7274

7375
#: octoprint_netconnectd/static/js/netconnectd.js:99
7476
#, python-format

‎translations/messages.pot‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: PROJECT VERSION\n"
1010
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
11-
"POT-Creation-Date: 2019-06-14 18:17+0200\n"
11+
"POT-Creation-Date: 2019-07-12 15:46+0200\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -55,15 +55,17 @@ msgid "no wifi interface present"
5555
msgstr ""
5656

5757
#: octoprint_netconnectd/static/js/netconnectd.js:89
58-
msgid "Connected (IP: "
58+
#, python-format
59+
msgid "Connected (IP: %(ip)s)"
5960
msgstr ""
6061

6162
#: octoprint_netconnectd/static/js/netconnectd.js:91
6263
msgid "Not connected"
6364
msgstr ""
6465

6566
#: octoprint_netconnectd/static/js/netconnectd.js:97
66-
msgid "Access point (IP: "
67+
#, python-format
68+
msgid "Access point (IP: %(ip)s)"
6769
msgstr ""
6870

6971
#: octoprint_netconnectd/static/js/netconnectd.js:99

0 commit comments

Comments
 (0)