Skip to content

Commit bacaf52

Browse files
Fruchtzwerg94Fruchtzwerg94
authored
Unified casing of strings (#1529)
1 parent 430a9bc commit bacaf52

File tree

1 file changed

+36
-36
lines changed

1 file changed

+36
-36
lines changed

‎wm_strings_en.h

+36-36
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ const char HTTP_ROOT_MAIN[] PROGMEM = "<h1>{t}</h1><h3>{v}</h3>";
4444

4545
const char * const HTTP_PORTAL_MENU[] PROGMEM = {
4646
"<form action='/wifi' method='get'><button>Configure WiFi</button></form><br/>\n", // MENU_WIFI
47-
"<form action='/0wifi' method='get'><button>Configure WiFi (No Scan)</button></form><br/>\n", // MENU_WIFINOSCAN
47+
"<form action='/0wifi' method='get'><button>Configure WiFi (No scan)</button></form><br/>\n", // MENU_WIFINOSCAN
4848
"<form action='/info' method='get'><button>Info</button></form><br/>\n", // MENU_INFO
4949
"<form action='/param' method='get'><button>Setup</button></form><br/>\n",//MENU_PARAM
5050
"<form action='/close' method='get'><button>Close</button></form><br/>\n", // MENU_CLOSE
@@ -75,15 +75,15 @@ const char HTTP_SCAN_LINK[] PROGMEM = "<br/><form action='/wifi?refresh=1
7575
const char HTTP_SAVED[] PROGMEM = "<div class='msg'>Saving Credentials<br/>Trying to connect ESP to network.<br />If it fails reconnect to AP to try again</div>";
7676
const char HTTP_PARAMSAVED[] PROGMEM = "<div class='msg S'>Saved<br/></div>";
7777
const char HTTP_END[] PROGMEM = "</div></body></html>";
78-
const char HTTP_ERASEBTN[] PROGMEM = "<br/><form action='/erase' method='get'><button class='D'>Erase WiFi Config</button></form>";
78+
const char HTTP_ERASEBTN[] PROGMEM = "<br/><form action='/erase' method='get'><button class='D'>Erase WiFi config</button></form>";
7979
const char HTTP_UPDATEBTN[] PROGMEM = "<br/><form action='/update' method='get'><button>Update</button></form>";
8080
const char HTTP_BACKBTN[] PROGMEM = "<hr><br/><form action='/' method='get'><button>Back</button></form>";
8181

8282
const char HTTP_STATUS_ON[] PROGMEM = "<div class='msg S'><strong>Connected</strong> to {v}<br/><em><small>with IP {i}</small></em></div>";
83-
const char HTTP_STATUS_OFF[] PROGMEM = "<div class='msg {c}'><strong>Not Connected</strong> to {v}{r}</div>"; // {c=class} {v=ssid} {r=status_off}
84-
const char HTTP_STATUS_OFFPW[] PROGMEM = "<br/>Authentication Failure"; // STATION_WRONG_PASSWORD, no eps32
83+
const char HTTP_STATUS_OFF[] PROGMEM = "<div class='msg {c}'><strong>Not connected</strong> to {v}{r}</div>"; // {c=class} {v=ssid} {r=status_off}
84+
const char HTTP_STATUS_OFFPW[] PROGMEM = "<br/>Authentication failure"; // STATION_WRONG_PASSWORD, no eps32
8585
const char HTTP_STATUS_OFFNOAP[] PROGMEM = "<br/>AP not found"; // WL_NO_SSID_AVAIL
86-
const char HTTP_STATUS_OFFFAIL[] PROGMEM = "<br/>Could not Connect"; // WL_CONNECT_FAILED
86+
const char HTTP_STATUS_OFFFAIL[] PROGMEM = "<br/>Could not connect"; // WL_CONNECT_FAILED
8787
const char HTTP_STATUS_NONE[] PROGMEM = "<div class='msg'>No AP set</div>";
8888
const char HTTP_BR[] PROGMEM = "<br/>";
8989

@@ -120,7 +120,7 @@ const char HTTP_STYLE[] PROGMEM = "<style>"
120120

121121
#ifndef WM_NOHELP
122122
const char HTTP_HELP[] PROGMEM =
123-
"<br/><h3>Available Pages</h3><hr>"
123+
"<br/><h3>Available pages</h3><hr>"
124124
"<table class='table'>"
125125
"<thead><tr><th>Page</th><th>Function</th></tr></thead><tbody>"
126126
"<tr><td><a href='/'>/</a></td>"
@@ -136,22 +136,22 @@ const char HTTP_HELP[] PROGMEM =
136136
"<tr><td><a href='/u'>/u</a></td>"
137137
"<td>OTA Update</td></tr>"
138138
"<tr><td><a href='/close'>/close</a></td>"
139-
"<td>Close the captiveportal popup,configportal will remain active</td></tr>"
139+
"<td>Close the captiveportal popup, config portal will remain active</td></tr>"
140140
"<tr><td>/exit</td>"
141-
"<td>Exit Config Portal, configportal will close</td></tr>"
141+
"<td>Exit Config portal, config portal will close</td></tr>"
142142
"<tr><td>/restart</td>"
143143
"<td>Reboot the device</td></tr>"
144144
"<tr><td>/erase</td>"
145-
"<td>Erase WiFi configuration and reboot Device. Device will not reconnect to a network until new WiFi configuration data is entered.</td></tr>"
145+
"<td>Erase WiFi configuration and reboot device. Device will not reconnect to a network until new WiFi configuration data is entered.</td></tr>"
146146
"</table>"
147147
"<p/>Github <a href='https://github.com/tzapu/WiFiManager'>https://github.com/tzapu/WiFiManager</a>.";
148148
#else
149149
const char HTTP_HELP[] PROGMEM = "";
150150
#endif
151151

152-
const char HTTP_UPDATE[] PROGMEM = "Upload New Firmware<br/><form method='POST' action='u' enctype='multipart/form-data' onchange=\"(function(el){document.getElementById('uploadbin').style.display = el.value=='' ? 'none' : 'initial';})(this)\"><input type='file' name='update' accept='.bin,application/octet-stream'><button id='uploadbin' type='submit' class='h D'>Update</button></form><small><a href='http://192.168.4.1/update' target='_blank'>* May not function inside captive portal, Open in browser http://192.168.4.1</a><small>";
153-
const char HTTP_UPDATE_FAIL[] PROGMEM = "<div class='msg D'><strong>Update Failed!</strong><Br/>Reboot device and try again</div>";
154-
const char HTTP_UPDATE_SUCCESS[] PROGMEM = "<div class='msg S'><strong>Update Successful. </strong> <br/> Device Rebooting now...</div>";
152+
const char HTTP_UPDATE[] PROGMEM = "Upload new firmware<br/><form method='POST' action='u' enctype='multipart/form-data' onchange=\"(function(el){document.getElementById('uploadbin').style.display = el.value=='' ? 'none' : 'initial';})(this)\"><input type='file' name='update' accept='.bin,application/octet-stream'><button id='uploadbin' type='submit' class='h D'>Update</button></form><small><a href='http://192.168.4.1/update' target='_blank'>* May not function inside captive portal, open in browser http://192.168.4.1</a><small>";
153+
const char HTTP_UPDATE_FAIL[] PROGMEM = "<div class='msg D'><strong>Update failed!</strong><Br/>Reboot device and try again</div>";
154+
const char HTTP_UPDATE_SUCCESS[] PROGMEM = "<div class='msg S'><strong>Update successful. </strong> <br/> Device rebooting now...</div>";
155155

156156
#ifdef WM_JSTEST
157157
const char HTTP_JS[] PROGMEM =
@@ -177,37 +177,37 @@ const char HTTP_JS[] PROGMEM =
177177
// @todo remove html elements from progmem, repetetive strings
178178
#ifdef ESP32
179179
const char HTTP_INFO_esphead[] PROGMEM = "<h3>esp32</h3><hr><dl>";
180-
const char HTTP_INFO_chiprev[] PROGMEM = "<dt>Chip Rev</dt><dd>{1}</dd>";
180+
const char HTTP_INFO_chiprev[] PROGMEM = "<dt>Chip rev</dt><dd>{1}</dd>";
181181
const char HTTP_INFO_lastreset[] PROGMEM = "<dt>Last reset reason</dt><dd>CPU0: {1}<br/>CPU1: {2}</dd>";
182-
const char HTTP_INFO_aphost[] PROGMEM = "<dt>Access Point Hostname</dt><dd>{1}</dd>";
182+
const char HTTP_INFO_aphost[] PROGMEM = "<dt>Access point hostname</dt><dd>{1}</dd>";
183183
const char HTTP_INFO_psrsize[] PROGMEM = "<dt>PSRAM Size</dt><dd>{1} bytes</dd>";
184184
const char HTTP_INFO_temp[] PROGMEM = "<dt>Temperature</dt><dd>{1} C&deg; / {2} F&deg;</dd><dt>Hall</dt><dd>{3}</dd>";
185185
#else
186186
const char HTTP_INFO_esphead[] PROGMEM = "<h3>esp8266</h3><hr><dl>";
187-
const char HTTP_INFO_fchipid[] PROGMEM = "<dt>Flash Chip ID</dt><dd>{1}</dd>";
188-
const char HTTP_INFO_corever[] PROGMEM = "<dt>Core Version</dt><dd>{1}</dd>";
189-
const char HTTP_INFO_bootver[] PROGMEM = "<dt>Boot Version</dt><dd>{1}</dd>";
187+
const char HTTP_INFO_fchipid[] PROGMEM = "<dt>Flash chip ID</dt><dd>{1}</dd>";
188+
const char HTTP_INFO_corever[] PROGMEM = "<dt>Core version</dt><dd>{1}</dd>";
189+
const char HTTP_INFO_bootver[] PROGMEM = "<dt>Boot version</dt><dd>{1}</dd>";
190190
const char HTTP_INFO_lastreset[] PROGMEM = "<dt>Last reset reason</dt><dd>{1}</dd>";
191-
const char HTTP_INFO_flashsize[] PROGMEM = "<dt>Real Flash Size</dt><dd>{1} bytes</dd>";
191+
const char HTTP_INFO_flashsize[] PROGMEM = "<dt>Real flash size</dt><dd>{1} bytes</dd>";
192192
#endif
193193

194194
const char HTTP_INFO_memsmeter[] PROGMEM = "<br/><progress value='{1}' max='{2}'></progress></dd>";
195-
const char HTTP_INFO_memsketch[] PROGMEM = "<dt>Memory - Sketch Size</dt><dd>Used / Total bytes<br/>{1} / {2}";
196-
const char HTTP_INFO_freeheap[] PROGMEM = "<dt>Memory - Free Heap</dt><dd>{1} bytes available</dd>";
195+
const char HTTP_INFO_memsketch[] PROGMEM = "<dt>Memory - Sketch size</dt><dd>Used / Total bytes<br/>{1} / {2}";
196+
const char HTTP_INFO_freeheap[] PROGMEM = "<dt>Memory - Free heap</dt><dd>{1} bytes available</dd>";
197197
const char HTTP_INFO_wifihead[] PROGMEM = "<br/><h3>WiFi</h3><hr>";
198-
const char HTTP_INFO_uptime[] PROGMEM = "<dt>Uptime</dt><dd>{1} Mins {2} Secs</dd>";
198+
const char HTTP_INFO_uptime[] PROGMEM = "<dt>Uptime</dt><dd>{1} mins {2} secs</dd>";
199199
const char HTTP_INFO_chipid[] PROGMEM = "<dt>Chip ID</dt><dd>{1}</dd>";
200-
const char HTTP_INFO_idesize[] PROGMEM = "<dt>Flash Size</dt><dd>{1} bytes</dd>";
201-
const char HTTP_INFO_sdkver[] PROGMEM = "<dt>SDK Version</dt><dd>{1}</dd>";
202-
const char HTTP_INFO_cpufreq[] PROGMEM = "<dt>CPU Frequency</dt><dd>{1}MHz</dd>";
203-
const char HTTP_INFO_apip[] PROGMEM = "<dt>Access Point IP</dt><dd>{1}</dd>";
204-
const char HTTP_INFO_apmac[] PROGMEM = "<dt>Access Point MAC</dt><dd>{1}</dd>";
205-
const char HTTP_INFO_apssid[] PROGMEM = "<dt>Access Point SSID</dt><dd>{1}</dd>";
200+
const char HTTP_INFO_idesize[] PROGMEM = "<dt>Flash size</dt><dd>{1} bytes</dd>";
201+
const char HTTP_INFO_sdkver[] PROGMEM = "<dt>SDK version</dt><dd>{1}</dd>";
202+
const char HTTP_INFO_cpufreq[] PROGMEM = "<dt>CPU frequency</dt><dd>{1}MHz</dd>";
203+
const char HTTP_INFO_apip[] PROGMEM = "<dt>Access point IP</dt><dd>{1}</dd>";
204+
const char HTTP_INFO_apmac[] PROGMEM = "<dt>Access point MAC</dt><dd>{1}</dd>";
205+
const char HTTP_INFO_apssid[] PROGMEM = "<dt>Access point SSID</dt><dd>{1}</dd>";
206206
const char HTTP_INFO_apbssid[] PROGMEM = "<dt>BSSID</dt><dd>{1}</dd>";
207207
const char HTTP_INFO_stassid[] PROGMEM = "<dt>Station SSID</dt><dd>{1}</dd>";
208208
const char HTTP_INFO_staip[] PROGMEM = "<dt>Station IP</dt><dd>{1}</dd>";
209-
const char HTTP_INFO_stagw[] PROGMEM = "<dt>Station Gateway</dt><dd>{1}</dd>";
210-
const char HTTP_INFO_stasub[] PROGMEM = "<dt>Station Subnet</dt><dd>{1}</dd>";
209+
const char HTTP_INFO_stagw[] PROGMEM = "<dt>Station gateway</dt><dd>{1}</dd>";
210+
const char HTTP_INFO_stasub[] PROGMEM = "<dt>Station subnet</dt><dd>{1}</dd>";
211211
const char HTTP_INFO_dnss[] PROGMEM = "<dt>DNS Server</dt><dd>{1}</dd>";
212212
const char HTTP_INFO_host[] PROGMEM = "<dt>Hostname</dt><dd>{1}</dd>";
213213
const char HTTP_INFO_stamac[] PROGMEM = "<dt>Station MAC</dt><dd>{1}</dd>";
@@ -217,7 +217,7 @@ const char HTTP_INFO_autoconx[] PROGMEM = "<dt>Autoconnect</dt><dd>{1}</dd>";
217217
const char HTTP_INFO_aboutver[] PROGMEM = "<dt>WiFiManager</dt><dd>{1}</dd>";
218218
const char HTTP_INFO_aboutarduino[] PROGMEM = "<dt>Arduino</dt><dd>{1}</dd>";
219219
const char HTTP_INFO_aboutsdk[] PROGMEM = "<dt>ESP-SDK/IDF</dt><dd>{1}</dd>";
220-
const char HTTP_INFO_aboutdate[] PROGMEM = "<dt>Build Date</dt><dd>{1}</dd>";
220+
const char HTTP_INFO_aboutdate[] PROGMEM = "<dt>Build date</dt><dd>{1}</dd>";
221221

222222
const char S_brand[] PROGMEM = "WiFiManager";
223223
const char S_debugPrefix[] PROGMEM = "*wm:";
@@ -229,27 +229,27 @@ const char S_GET[] PROGMEM = "GET";
229229
const char S_POST[] PROGMEM = "POST";
230230
const char S_NA[] PROGMEM = "Unknown";
231231
const char S_passph[] PROGMEM = "********";
232-
const char S_titlewifisaved[] PROGMEM = "Credentials Saved";
233-
const char S_titlewifisettings[] PROGMEM = "Settings Saved";
232+
const char S_titlewifisaved[] PROGMEM = "Credentials saved";
233+
const char S_titlewifisettings[] PROGMEM = "Settings saved";
234234
const char S_titlewifi[] PROGMEM = "Config ESP";
235235
const char S_titleinfo[] PROGMEM = "Info";
236236
const char S_titleparam[] PROGMEM = "Setup";
237-
const char S_titleparamsaved[] PROGMEM = "Setup Saved";
237+
const char S_titleparamsaved[] PROGMEM = "Setup saved";
238238
const char S_titleexit[] PROGMEM = "Exit";
239239
const char S_titlereset[] PROGMEM = "Reset";
240240
const char S_titleerase[] PROGMEM = "Erase";
241241
const char S_titleclose[] PROGMEM = "Close";
242242
const char S_options[] PROGMEM = "options";
243243
const char S_nonetworks[] PROGMEM = "No networks found. Refresh to scan again.";
244244
const char S_staticip[] PROGMEM = "Static IP";
245-
const char S_staticgw[] PROGMEM = "Static Gateway";
245+
const char S_staticgw[] PROGMEM = "Static gateway";
246246
const char S_staticdns[] PROGMEM = "Static DNS";
247247
const char S_subnet[] PROGMEM = "Subnet";
248248
const char S_exiting[] PROGMEM = "Exiting";
249249
const char S_resetting[] PROGMEM = "Module will reset in a few seconds.";
250250
const char S_closing[] PROGMEM = "You can close the page, portal will continue to run";
251-
const char S_error[] PROGMEM = "An Error Occured";
252-
const char S_notfound[] PROGMEM = "File Not Found\n\n";
251+
const char S_error[] PROGMEM = "An error occured";
252+
const char S_notfound[] PROGMEM = "File not found\n\n";
253253
const char S_uri[] PROGMEM = "URI: ";
254254
const char S_method[] PROGMEM = "\nMethod: ";
255255
const char S_args[] PROGMEM = "\nArguments: ";

0 commit comments

Comments
 (0)