From ed2b2c2e605ae4e47ca209e0cc34ee27e41c4687 Mon Sep 17 00:00:00 2001 From: Ian Bicking Date: Tue, 1 Aug 2017 13:50:12 -0500 Subject: [PATCH] Fix #2410, use 'Screenshot: title' for the of shot pages --- locales/en-US/server.ftl | 5 +++-- server/src/pages/shot/model.js | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/locales/en-US/server.ftl b/locales/en-US/server.ftl index af41eeb501..475aba7490 100644 --- a/locales/en-US/server.ftl +++ b/locales/en-US/server.ftl @@ -1,5 +1,5 @@ // Localization for Server-side strings of Firefox Screenshots -// +// // Please don't localize Firefox, Firefox Screenshots, or Screenshots @@ -81,6 +81,8 @@ notFoundPageDescription = Page not found. [[ Shot page ]] +// This is the HTML title tag of the page +shotPageTitle = Screenshot: { $originalTitle } shotPageAlertErrorUpdatingExpirationTime = Error saving expiration shotPageAlertErrorDeletingShot = Error deleting shot shotPageAlertErrorUpdatingTitle = Error saving title @@ -238,4 +240,3 @@ metricsPageHeader = Metrics metricsPageGeneratedDateTime = Generated at: { $created } // Note { $time } is a placeholder for a number of milliseconds, like '100' metricsPageDatabaseQueryTime = (database time: { $time }ms) - diff --git a/server/src/pages/shot/model.js b/server/src/pages/shot/model.js index f5418a04f1..d25e9441ee 100644 --- a/server/src/pages/shot/model.js +++ b/server/src/pages/shot/model.js @@ -13,8 +13,9 @@ exports.createModel = function(req) { if (req.shot.favicon) { req.shot.favicon = createProxyUrl(req, req.shot.favicon); } + let title = req.getText("shotPageTitle", {originalTitle: req.shot.title}); let serverPayload = { - title: req.shot.title, + title, staticLink: req.staticLink, backend: req.backend, shot: req.shot,