Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update packages and translations #12665

Merged
merged 4 commits into from
Nov 29, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions external/builder/builder.js
Original file line number Diff line number Diff line change
Expand Up @@ -202,14 +202,14 @@ function preprocessCSS(mode, source, destination) {
}

function expandImports(content, baseUrl) {
return content.replace(/^\s*@import\s+url\(([^)]+)\);\s*$/gm, function (
all,
url
) {
var file = path.join(path.dirname(baseUrl), url);
var imported = fs.readFileSync(file, "utf8").toString();
return expandImports(imported, file);
});
return content.replace(
/^\s*@import\s+url\(([^)]+)\);\s*$/gm,
function (all, url) {
var file = path.join(path.dirname(baseUrl), url);
var imported = fs.readFileSync(file, "utf8").toString();
return expandImports(imported, file);
}
);
}

function removePrefixed(content, hasPrefixedFilter) {
Expand Down
95 changes: 49 additions & 46 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -577,45 +577,46 @@ gulp.task("buildnumber", function (done) {
console.log();
console.log("### Getting extension build number");

exec("git log --format=oneline " + config.baseVersion + "..", function (
err,
stdout,
stderr
) {
var buildNumber = 0;
if (!err) {
// Build number is the number of commits since base version
buildNumber = stdout ? stdout.match(/\n/g).length : 0;
} else {
console.log("This is not a Git repository; using default build number.");
}

console.log("Extension build number: " + buildNumber);

var version = config.versionPrefix + buildNumber;

exec('git log --format="%h" -n 1', function (err2, stdout2, stderr2) {
var buildCommit = "";
if (!err2) {
buildCommit = stdout2.replace("\n", "");
exec(
"git log --format=oneline " + config.baseVersion + "..",
function (err, stdout, stderr) {
var buildNumber = 0;
if (!err) {
// Build number is the number of commits since base version
buildNumber = stdout ? stdout.match(/\n/g).length : 0;
} else {
console.log(
"This is not a Git repository; using default build number."
);
}

createStringSource(
"version.json",
JSON.stringify(
{
version: version,
build: buildNumber,
commit: buildCommit,
},
null,
2
console.log("Extension build number: " + buildNumber);

var version = config.versionPrefix + buildNumber;

exec('git log --format="%h" -n 1', function (err2, stdout2, stderr2) {
var buildCommit = "";
if (!err2) {
buildCommit = stdout2.replace("\n", "");
}

createStringSource(
"version.json",
JSON.stringify(
{
version: version,
build: buildNumber,
commit: buildCommit,
},
null,
2
)
)
)
.pipe(gulp.dest(BUILD_DIR))
.on("end", done);
});
});
.pipe(gulp.dest(BUILD_DIR))
.on("end", done);
});
}
);
});

gulp.task("default_preferences-pre", function () {
Expand Down Expand Up @@ -1619,17 +1620,19 @@ gulp.task("baseline", function (done) {
return;
}

exec("git checkout " + baselineCommit, { cwd: workingDirectory }, function (
error2
) {
if (error2) {
done(new Error("Baseline commit checkout failed."));
return;
}
exec(
"git checkout " + baselineCommit,
{ cwd: workingDirectory },
function (error2) {
if (error2) {
done(new Error("Baseline commit checkout failed."));
return;
}

console.log('Baseline commit "' + baselineCommit + '" checked out.');
done();
});
console.log('Baseline commit "' + baselineCommit + '" checked out.');
done();
}
);
});
});

Expand Down
2 changes: 1 addition & 1 deletion l10n/el/viewer.properties
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ annotation_date_string={{date}}, {{time}}
text_annotation_type.alt=[{{type}} Σχόλιο]
password_label=Εισαγωγή κωδικού για το άνοιγμα του PDF αρχείου.
password_invalid=Μη έγκυρος κωδικός. Προσπαθείστε ξανά.
password_ok=ΟΚ
password_ok=OK
password_cancel=Ακύρωση

printing_not_supported=Προειδοποίηση: Η εκτύπωση δεν υποστηρίζεται πλήρως από αυτόν τον περιηγητή.
Expand Down
2 changes: 2 additions & 0 deletions l10n/eu/viewer.properties
Original file line number Diff line number Diff line change
Expand Up @@ -143,11 +143,13 @@ document_outline.title=Erakutsi dokumentuaren eskema (klik bikoitza elementu guz
document_outline_label=Dokumentuaren eskema
attachments.title=Erakutsi eranskinak
attachments_label=Eranskinak
layers_label=Geruzak
thumbs.title=Erakutsi koadro txikiak
thumbs_label=Koadro txikiak
findbar.title=Bilatu dokumentuan
findbar_label=Bilatu

additional_layers=Geruza gehigarriak
# LOCALIZATION NOTE (page_canvas): "{{page}}" will be replaced by the page number.
page_canvas={{page}}. orria
# Thumbnails panel item (tooltip and alt text for images)
Expand Down
4 changes: 2 additions & 2 deletions l10n/oc/viewer.properties
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ error_stack=Pila : {{stack}}
error_file=Fichièr : {{file}}
# LOCALIZATION NOTE (error_line): "{{line}}" will be replaced with a line number
error_line=Linha : {{line}}
rendering_error=Una error s'es produita pendent l'afichatge de la pagina.
rendering_error=Una error s'es producha pendent l'afichatge de la pagina.

# Predefined zoom values
page_scale_width=Largor plena
Expand All @@ -227,7 +227,7 @@ page_scale_percent={{scale}}%

# Loading indicator messages
loading_error_indicator=Error
loading_error=Una error s'es produita pendent lo cargament del fichièr PDF.
loading_error=Una error s'es producha pendent lo cargament del fichièr PDF.
invalid_file_error=Fichièr PDF invalid o corromput.
missing_file_error=Fichièr PDF mancant.
unexpected_response_error=Responsa de servidor imprevista.
Expand Down
4 changes: 2 additions & 2 deletions l10n/pt-BR/viewer.properties
Original file line number Diff line number Diff line change
Expand Up @@ -136,10 +136,10 @@ print_progress_close=Cancelar
# Tooltips and alt text for side panel toolbar buttons
# (the _label strings are alt text for the buttons, the .title strings are
# tooltips)
toggle_sidebar.title=Alternar painel
toggle_sidebar.title=Exibir/ocultar painel
toggle_sidebar_notification.title=Alternar o painel (documento contém marcadores e anexos)
toggle_sidebar_notification2.title=Exibir/ocultar painel lateral (documento contém estrutura/anexos/camadas)
toggle_sidebar_label=Alternar painel
toggle_sidebar_label=Exibir/ocultar painel
document_outline.title=Mostrar a estrutura do documento (dê um duplo-clique para expandir/recolher todos os itens)
document_outline_label=Estrutura do documento
attachments.title=Mostrar anexos
Expand Down
Loading