libre-service.eu/pad.libre-service.eu-etherpad
libre-service.eu/pad.libre-service.eu-etherpad
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-01-19 22:23:33 +01:00
Code Issues Projects Releases Wiki Activity

Fix missing arg handling in html10n.js

Browse source
This commit is contained in:
ilmar 2020-11-05 11:36:22 +02:00 committed by John McLear
parent 405e3e3e19
commit d5c5ca224b
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/static/css/pad/gritter.css
View file

@ -31,6 +31,8 @@
.gritter-item .gritter-content { .gritter-item .gritter-content {
flex: 1 auto; flex: 1 auto;
text-align: center; text-align: center;
width: 95%;
overflow-wrap: break-word;
} }
.gritter-item .gritter-close { .gritter-item .gritter-close {

6
src/static/js/html10n.js
View file

@ -779,16 +779,16 @@ window.html10n = (function(window, document, undefined) {
function substArguments(str, args) { function substArguments(str, args) {
var reArgs = /\{\{\s*([a-zA-Z\.]+)\s*\}\}/ var reArgs = /\{\{\s*([a-zA-Z\.]+)\s*\}\}/
, match , match
var translations = html10n.translations;
while (match = reArgs.exec(str)) { while (match = reArgs.exec(str)) {
if (!match || match.length < 2) if (!match || match.length < 2)
return str // argument key not found return str // argument key not found
var arg = match[1] var arg = match[1]
, sub = '' , sub = ''
if (arg in args) { if (args && arg in args) {
sub = args[arg] sub = args[arg]
} else if (arg in translations) { } else if (translations && arg in translations) {
sub = translations[arg] sub = translations[arg]
} else { } else {
console.warn('Could not find argument {{' + arg + '}}') console.warn('Could not find argument {{' + arg + '}}')