joomla/cms
29
0
Fork 0
mirror of https://github.com/joomla/joomla-cms.git synced 2024-05-28 07:53:37 +00:00
Code Packages Releases Activity

[4.4] translation description text static error pages (#42030)

Browse Source 
* move meta declaration

for better upmerge (conflicts #41935)

* same help link element

* check if valid ref

* check if valid elements

* add descText1

* update static error pages

* use early return
This commit is contained in:
Christian Heel 2023-11-15 08:03:00 +01:00 committed by GitHub
parent 06e4116e13
commit e5c91e0309
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
build/warning_page/template.js
View File

@ -5,6 +5,8 @@ var errorLocale = window.errorLocale || null;
if (errorLocale) {
var header = document.getElementById('headerText');
var desc1 = document.getElementById('descText1');
var helpLink = document.getElementById('linkHelp');
// Create links for all the languages
Object.keys(errorLocale).forEach(function(key) {
@ -18,18 +20,19 @@ var errorLocale = window.errorLocale || null;
}
document.getElementById('translatedLanguagesSelect').addEventListener('change', function(e) {
var ref = e.target.value, helpLink, meta;
var ref = e.target.value;
if (ref) {
header.innerHTML = errorLocale[ref].header;
if (!ref) {
return;
}
helpLink = document.getElementById('linkHelp');
if (helpLink) {
if (header && desc1 && helpLink) {
header.innerHTML = errorLocale[ref].header;
desc1.innerHTML = errorLocale[ref].text1;
helpLink.innerText = errorLocale[ref]['help-url-text'];
}
meta = document.querySelector('[http-equiv="Content-Language"]');
var meta = document.querySelector('[http-equiv="Content-Language"]');
if (meta) {
meta.setAttribute('content', ref);
}
@ -46,15 +49,13 @@ var errorLocale = window.errorLocale || null;
document.querySelector('#translatedLanguagesSelect option[value="' + key + '"]').setAttribute('selected', 'selected');
// Append the translated strings
header.innerHTML = errorLocale[key].header;
var helpLink = document.getElementById('linkHelp'), meta;
if (helpLink) {
if (header && desc1 && helpLink) {
header.innerHTML = errorLocale[key].header;
desc1.innerHTML = errorLocale[key].text1;
helpLink.innerText = errorLocale[key]['help-url-text'];
}
meta = document.querySelector('[http-equiv="Content-Language"]');
var meta = document.querySelector('[http-equiv="Content-Language"]');
if (meta) {
meta.setAttribute('content', key);
}

2
templates/system/build_incomplete.html
View File

@ -33,7 +33,7 @@
</div>
</div>
</div>
<script>var errorLocale=window.errorLocale||null;(function(e,n){"use strict";if(n){var s=e.getElementById("headerText");Object.keys(n).forEach(function(t){var l=e.getElementById("translatedLanguagesSelect"),a=e.createElement("option");a.text=n[t].language,a.value=t,t==="en-GB"&&a.setAttribute("selected","selected"),e.getElementById("translatedLanguagesSelect").addEventListener("change",function(u){var i=u.target.value,g,r;i&&(s.innerHTML=n[i].header),g=e.getElementById("linkHelp"),g&&(g.innerText=n[i]["help-url-text"]),r=e.querySelector('[http-equiv="Content-Language"]'),r&&r.setAttribute("content",i)}),l.appendChild(a)}),Object.keys(n).forEach(function(t){if(navigator.language===t){e.querySelector('#translatedLanguagesSelect option[value="en-GB"]').removeAttribute("selected"),e.querySelector('#translatedLanguagesSelect option[value="'+t+'"]').setAttribute("selected","selected"),s.innerHTML=n[t].header;var l=e.getElementById("linkHelp"),a;l&&(l.innerText=n[t]["help-url-text"]),a=e.querySelector('[http-equiv="Content-Language"]'),a&&a.setAttribute("content",t)}})}})(document,errorLocale);
<script>var errorLocale=window.errorLocale||null;(function(t,e){"use strict";if(e){var i=t.getElementById("headerText"),l=t.getElementById("descText1"),g=t.getElementById("linkHelp");Object.keys(e).forEach(function(n){var u=t.getElementById("translatedLanguagesSelect"),r=t.createElement("option");r.text=e[n].language,r.value=n,n==="en-GB"&&r.setAttribute("selected","selected"),t.getElementById("translatedLanguagesSelect").addEventListener("change",function(v){var a=v.target.value;if(a){i&&l&&g&&(i.innerHTML=e[a].header,l.innerHTML=e[a].text1,g.innerText=e[a]["help-url-text"]);var s=t.querySelector('[http-equiv="Content-Language"]');s&&s.setAttribute("content",a)}}),u.appendChild(r)}),Object.keys(e).forEach(function(n){if(navigator.language===n){t.querySelector('#translatedLanguagesSelect option[value="en-GB"]').removeAttribute("selected"),t.querySelector('#translatedLanguagesSelect option[value="'+n+'"]').setAttribute("selected","selected"),i&&l&&g&&(i.innerHTML=e[n].header,l.innerHTML=e[n].text1,g.innerText=e[n]["help-url-text"]);var u=t.querySelector('[http-equiv="Content-Language"]');u&&u.setAttribute("content",n)}})}})(document,errorLocale);
</script><!-- Sets the script, IMPORTANT DO NOT REMOVE -->
</body>
</html>

2
templates/system/fatal-error.html
View File

@ -33,7 +33,7 @@
</div>
</div>
</div>
<script>var errorLocale=window.errorLocale||null;(function(e,n){"use strict";if(n){var s=e.getElementById("headerText");Object.keys(n).forEach(function(t){var l=e.getElementById("translatedLanguagesSelect"),a=e.createElement("option");a.text=n[t].language,a.value=t,t==="en-GB"&&a.setAttribute("selected","selected"),e.getElementById("translatedLanguagesSelect").addEventListener("change",function(u){var i=u.target.value,g,r;i&&(s.innerHTML=n[i].header),g=e.getElementById("linkHelp"),g&&(g.innerText=n[i]["help-url-text"]),r=e.querySelector('[http-equiv="Content-Language"]'),r&&r.setAttribute("content",i)}),l.appendChild(a)}),Object.keys(n).forEach(function(t){if(navigator.language===t){e.querySelector('#translatedLanguagesSelect option[value="en-GB"]').removeAttribute("selected"),e.querySelector('#translatedLanguagesSelect option[value="'+t+'"]').setAttribute("selected","selected"),s.innerHTML=n[t].header;var l=e.getElementById("linkHelp"),a;l&&(l.innerText=n[t]["help-url-text"]),a=e.querySelector('[http-equiv="Content-Language"]'),a&&a.setAttribute("content",t)}})}})(document,errorLocale);
<script>var errorLocale=window.errorLocale||null;(function(t,e){"use strict";if(e){var i=t.getElementById("headerText"),l=t.getElementById("descText1"),g=t.getElementById("linkHelp");Object.keys(e).forEach(function(n){var u=t.getElementById("translatedLanguagesSelect"),r=t.createElement("option");r.text=e[n].language,r.value=n,n==="en-GB"&&r.setAttribute("selected","selected"),t.getElementById("translatedLanguagesSelect").addEventListener("change",function(v){var a=v.target.value;if(a){i&&l&&g&&(i.innerHTML=e[a].header,l.innerHTML=e[a].text1,g.innerText=e[a]["help-url-text"]);var s=t.querySelector('[http-equiv="Content-Language"]');s&&s.setAttribute("content",a)}}),u.appendChild(r)}),Object.keys(e).forEach(function(n){if(navigator.language===n){t.querySelector('#translatedLanguagesSelect option[value="en-GB"]').removeAttribute("selected"),t.querySelector('#translatedLanguagesSelect option[value="'+n+'"]').setAttribute("selected","selected"),i&&l&&g&&(i.innerHTML=e[n].header,l.innerHTML=e[n].text1,g.innerText=e[n]["help-url-text"]);var u=t.querySelector('[http-equiv="Content-Language"]');u&&u.setAttribute("content",n)}})}})(document,errorLocale);
</script><!-- Sets the script, IMPORTANT DO NOT REMOVE -->
</body>
</html>

2
templates/system/incompatible.html
View File

@ -33,7 +33,7 @@
</div>
</div>
</div>
<script>var errorLocale=window.errorLocale||null;(function(e,n){"use strict";if(n){var s=e.getElementById("headerText");Object.keys(n).forEach(function(t){var l=e.getElementById("translatedLanguagesSelect"),a=e.createElement("option");a.text=n[t].language,a.value=t,t==="en-GB"&&a.setAttribute("selected","selected"),e.getElementById("translatedLanguagesSelect").addEventListener("change",function(u){var i=u.target.value,g,r;i&&(s.innerHTML=n[i].header),g=e.getElementById("linkHelp"),g&&(g.innerText=n[i]["help-url-text"]),r=e.querySelector('[http-equiv="Content-Language"]'),r&&r.setAttribute("content",i)}),l.appendChild(a)}),Object.keys(n).forEach(function(t){if(navigator.language===t){e.querySelector('#translatedLanguagesSelect option[value="en-GB"]').removeAttribute("selected"),e.querySelector('#translatedLanguagesSelect option[value="'+t+'"]').setAttribute("selected","selected"),s.innerHTML=n[t].header;var l=e.getElementById("linkHelp"),a;l&&(l.innerText=n[t]["help-url-text"]),a=e.querySelector('[http-equiv="Content-Language"]'),a&&a.setAttribute("content",t)}})}})(document,errorLocale);
<script>var errorLocale=window.errorLocale||null;(function(t,e){"use strict";if(e){var i=t.getElementById("headerText"),l=t.getElementById("descText1"),g=t.getElementById("linkHelp");Object.keys(e).forEach(function(n){var u=t.getElementById("translatedLanguagesSelect"),r=t.createElement("option");r.text=e[n].language,r.value=n,n==="en-GB"&&r.setAttribute("selected","selected"),t.getElementById("translatedLanguagesSelect").addEventListener("change",function(v){var a=v.target.value;if(a){i&&l&&g&&(i.innerHTML=e[a].header,l.innerHTML=e[a].text1,g.innerText=e[a]["help-url-text"]);var s=t.querySelector('[http-equiv="Content-Language"]');s&&s.setAttribute("content",a)}}),u.appendChild(r)}),Object.keys(e).forEach(function(n){if(navigator.language===n){t.querySelector('#translatedLanguagesSelect option[value="en-GB"]').removeAttribute("selected"),t.querySelector('#translatedLanguagesSelect option[value="'+n+'"]').setAttribute("selected","selected"),i&&l&&g&&(i.innerHTML=e[n].header,l.innerHTML=e[n].text1,g.innerText=e[n]["help-url-text"]);var u=t.querySelector('[http-equiv="Content-Language"]');u&&u.setAttribute("content",n)}})}})(document,errorLocale);
</script><!-- Sets the script, IMPORTANT DO NOT REMOVE -->
</body>
</html>