From 67575c1068e07a120d147b14f1d1da6e8dd72c17 Mon Sep 17 00:00:00 2001 From: Jeroen Vloothuis Date: Sun, 29 Aug 2021 10:35:07 +0200 Subject: [PATCH] Show message for Safari users that push will not work --- core/assets/js/app.js | 65 ++++++++++--------- core/lib/core_web/live/user/settings.ex | 1 + .../gettext/en/LC_MESSAGES/eyra-account.po | 13 ++-- .../en/LC_MESSAGES/eyra-imagecatalog.po | 10 +-- core/priv/gettext/en/LC_MESSAGES/eyra-link.po | 2 +- .../gettext/en/LC_MESSAGES/eyra-promotion.po | 36 +++++----- .../gettext/en/LC_MESSAGES/eyra-support.po | 14 ++-- core/priv/gettext/en/LC_MESSAGES/eyra-ui.po | 5 ++ .../gettext/en/LC_MESSAGES/link-survey.po | 18 ++--- core/priv/gettext/eyra-account.pot | 13 ++-- core/priv/gettext/eyra-imagecatalog.pot | 10 +-- core/priv/gettext/eyra-promotion.pot | 36 +++++----- core/priv/gettext/eyra-support.pot | 14 ++-- core/priv/gettext/eyra-ui.pot | 5 ++ core/priv/gettext/link-survey.pot | 18 ++--- .../gettext/nl/LC_MESSAGES/eyra-account.po | 13 ++-- .../nl/LC_MESSAGES/eyra-imagecatalog.po | 10 +-- core/priv/gettext/nl/LC_MESSAGES/eyra-link.po | 2 +- .../gettext/nl/LC_MESSAGES/eyra-promotion.po | 36 +++++----- .../gettext/nl/LC_MESSAGES/eyra-support.po | 14 ++-- core/priv/gettext/nl/LC_MESSAGES/eyra-ui.po | 5 ++ .../gettext/nl/LC_MESSAGES/link-survey.po | 18 ++--- 22 files changed, 197 insertions(+), 161 deletions(-) diff --git a/core/assets/js/app.js b/core/assets/js/app.js index 5dd7269c2..755653777 100644 --- a/core/assets/js/app.js +++ b/core/assets/js/app.js @@ -76,16 +76,16 @@ Hooks.NativeWrapper = { }, toggleSidePanel() { console.log("NativeWrapper::toggleSidePanel") - nativeWrapper.toggleSidePanel({origin: "right"}) + nativeWrapper.toggleSidePanel({ origin: "right" }) window.dispatchEvent(new CustomEvent("toggle-native-menu", {})) } } Hooks.PythonUploader = { - destroyed(){ + destroyed() { this.worker && this.worker.terminate(); }, - mounted(){ + mounted() { console.log("PythonUploader mounted") this.worker = new Worker("/js/pyworker.js"); @@ -94,7 +94,7 @@ Hooks.PythonUploader = { const { eventType } = event.data; if (eventType === "initialized") { const script = this.el.getElementsByTagName("code")[0].innerText - this.worker.postMessage({eventType: "runPython", script }) + this.worker.postMessage({ eventType: "runPython", script }) // Let the LiveView know everything is ready this.el.querySelector(".loading-indicator").hidden = true; this.el.querySelector(".step2").hidden = false; @@ -107,7 +107,7 @@ Hooks.PythonUploader = { } } // Hook up the process button to the worker - this.el.addEventListener("click", (event)=>{ + this.el.addEventListener("click", (event) => { if (event.target.dataset.role !== "process-trigger") { return; } @@ -126,7 +126,7 @@ Hooks.PythonUploader = { reader.read().then(sendToWorker); }) // Hook up the share results button - this.el.addEventListener("change", (event)=>{ + this.el.addEventListener("change", (event) => { if (event.target.dataset.role !== "file-input") { return; } @@ -136,7 +136,7 @@ Hooks.PythonUploader = { this.el.querySelector(".script").hidden = false; }) // Hook up the share results button - this.el.addEventListener("click", (event)=>{ + this.el.addEventListener("click", (event) => { if (event.target.dataset.role !== "donate-trigger") { return; } @@ -207,7 +207,7 @@ window.nativeIOSWrapper = { id }); }, - toggleSidePanel: (info)=>{ + toggleSidePanel: (info) => { window.webkit.messageHandlers.Native.postMessage({ type: "toggleSidePanel", ...info @@ -290,7 +290,7 @@ window.addEventListener("phx:page-loading-stop", (info) => { id: screenId(info.detail.to), rightBarButtons: [{ title: "Menu", - action: {id: "toggle-native-menu"}, + action: { id: "toggle-native-menu" }, }] }); nativeWrapper.webReady(screenId(info.detail.to)); @@ -303,9 +303,9 @@ window.setScreenFromNative = (screenId, state) => { }, 0); }); }; -window.handleActionFromNative = (action)=>{ +window.handleActionFromNative = (action) => { if (action.id === "toggle-native-menu") { - nativeWrapper.toggleSidePanel({origin: "right"}) + nativeWrapper.toggleSidePanel({ origin: "right" }) window.dispatchEvent(new CustomEvent("toggle-native-menu", {})) } } @@ -325,16 +325,19 @@ window.liveSocket = liveSocket; // PWA // -const pushStore = Spruce.store("push", {registration: "pending"}) +const pushStore = Spruce.store("push", { registration: "pending" }) const getExistingSubscription = () => { - return navigator.serviceWorker.ready.then((registration)=> { - return registration.pushManager.getSubscription().then(subscription=>{ - return {registration, subscription}; + return navigator.serviceWorker.ready.then((registration) => { + if (registration.pushManager === undefined) { + throw "unavailable"; + } + return registration.pushManager.getSubscription().then(subscription => { + return { registration, subscription }; }) }); } const registerPushSubscription = (subscription) => { - console.log("Server", subscription); + console.log("Server", subscription); return fetch('/web-push/register', { method: 'post', headers: { @@ -343,28 +346,28 @@ const registerPushSubscription = (subscription) => { body: JSON.stringify({ subscription: subscription }), - }).then(()=>{ + }).then(() => { pushStore.registration = "registered" }); } -window.registerForPush = ()=>{ +window.registerForPush = () => { if (!('serviceWorker' in navigator)) { alert("Sorry, your browser does not support push") return; } pushStore.registration = "registering" - getExistingSubscription().then(({registration,subscription})=> { + getExistingSubscription().then(({ registration, subscription }) => { if (subscription) { // already registered return subscription; } - return fetch('/web-push/vapid-public-key').then((response)=>{ + return fetch('/web-push/vapid-public-key').then((response) => { console.log("Vapid", response); return response.text() - }).then((vapidPublicKey)=>{ + }).then((vapidPublicKey) => { // Chrome doesn’t accept the base64-encoded (string) vapidPublicKey yet urlBase64ToUint8Array() is defined in /tools.js const convertedVapidKey = urlBase64ToUint8Array(vapidPublicKey); @@ -373,24 +376,26 @@ window.registerForPush = ()=>{ applicationServerKey: convertedVapidKey }); }) - }).then(registerPushSubscription).catch(e=>{ + }).then(registerPushSubscription).catch(e => { pushStore.registration = "denied"; }); } if ('serviceWorker' in navigator) { - navigator.serviceWorker.register('/sw.js', {scope: './'}) - .catch((error) => { - // registration failed - console.log('Registration failed with ' + error); - }); + navigator.serviceWorker.register('/sw.js', { scope: './' }) + .catch((error) => { + // registration failed + console.log('Registration failed with ' + error); + }); - getExistingSubscription().then(({subscription}) => { + getExistingSubscription().then(({ subscription }) => { if (subscription) { return registerPushSubscription(subscription); } else { pushStore.registration = "not-registered"; } - }) + }).catch(e => { + pushStore.registration = "unavailable"; + }); } else { - Spruce.store("push", {registration: "unavailable"}) + Spruce.store("push", { registration: "unavailable" }) } diff --git a/core/lib/core_web/live/user/settings.ex b/core/lib/core_web/live/user/settings.ex index 687a0b667..e04589ce6 100644 --- a/core/lib/core_web/live/user/settings.ex +++ b/core/lib/core_web/live/user/settings.ex @@ -45,6 +45,7 @@ defmodule CoreWeb.User.Settings do {{dgettext("eyra-account", "push.registration.pending")}} {{dgettext("eyra-account", "push.registration.denied")}} + {{dgettext("eyra-account", "push.registration.unavailable")}}
{{dgettext("eyra-account", "push.registration.activated")}} diff --git a/core/priv/gettext/en/LC_MESSAGES/eyra-account.po b/core/priv/gettext/en/LC_MESSAGES/eyra-account.po index 5286ba493..e319e5544 100644 --- a/core/priv/gettext/en/LC_MESSAGES/eyra-account.po +++ b/core/priv/gettext/en/LC_MESSAGES/eyra-account.po @@ -97,12 +97,12 @@ msgid "push.registration.title" msgstr "Push notifications" #, elixir-format -#: lib/core_web/live/user/settings.ex:50 +#: lib/core_web/live/user/settings.ex:52 msgid "push.registration.activated" msgstr "Push notifications are activated on this browser" #, elixir-format -#: lib/core_web/live/user/settings.ex:47 +#: lib/core_web/live/user/settings.ex:48 msgid "push.registration.denied" msgstr "Push notifications are deactivated on this browser" @@ -112,12 +112,12 @@ msgid "push.registration.label" msgstr "Activate on this browser" #, elixir-format -#: lib/core_web/live/user/settings.ex:46 +#: lib/core_web/live/user/settings.ex:47 msgid "push.registration.pending" msgstr "Determining state.." #, elixir-format -#: lib/core_web/live/user/settings.ex:52 +#: lib/core_web/live/user/settings.ex:54 msgid "push.registration.test.button" msgstr "Send test notification" @@ -170,3 +170,8 @@ msgstr "Students of the selected studies are eligitable. No selection means all #: bundles/link/lib/pool/form/submission.ex:146 msgid "features.content.description" msgstr "Students with the selected characteristics are eligitable. No selection means all students are eligitable." + +#, elixir-format, fuzzy +#: lib/core_web/live/user/settings.ex:49 +msgid "push.registration.unavailable" +msgstr "Notifications are not (yet) available for your browser. Firefox, Chrome or Edge are supported." diff --git a/core/priv/gettext/en/LC_MESSAGES/eyra-imagecatalog.po b/core/priv/gettext/en/LC_MESSAGES/eyra-imagecatalog.po index bed90ac18..afa4ae961 100644 --- a/core/priv/gettext/en/LC_MESSAGES/eyra-imagecatalog.po +++ b/core/priv/gettext/en/LC_MESSAGES/eyra-imagecatalog.po @@ -12,29 +12,29 @@ msgstr "" "Plural-Forms: nplurals=2\n" #, elixir-format -#: lib/core_web/image_catalog_picker.ex:38 +#: lib/core_web/image_catalog_picker.ex:147 msgid "no.results.found.message" msgstr "No images found" #, elixir-format -#: lib/core_web/image_catalog_picker.ex:33 +#: lib/core_web/image_catalog_picker.ex:142 msgid "search.image.button" msgstr "Search" #, elixir-format -#: lib/core_web/image_catalog_picker.ex:22 +#: lib/core_web/image_catalog_picker.ex:131 msgid "search.image.title" msgstr "Search and select an image" #, elixir-format -#: lib/core_web/image_catalog_picker.ex:42 +#: lib/core_web/image_catalog_picker.ex:151 msgid "images.found.message" msgid_plural "images.found.message.%{count}" msgstr[0] "1 image found:" msgstr[1] "%{count} images found:" #, elixir-format -#: lib/core_web/image_catalog_picker.ex:73 +#: lib/core_web/image_catalog_picker.ex:161 msgid "page.info.message" msgid_plural "page.info.message.%{count}" msgstr[0] "1 image" diff --git a/core/priv/gettext/en/LC_MESSAGES/eyra-link.po b/core/priv/gettext/en/LC_MESSAGES/eyra-link.po index eff8511d6..3663317f0 100644 --- a/core/priv/gettext/en/LC_MESSAGES/eyra-link.po +++ b/core/priv/gettext/en/LC_MESSAGES/eyra-link.po @@ -91,7 +91,7 @@ msgstr "For research" msgid "marketplace-button" msgstr "Go to marketplace" -#, elixir-format, fuzzy +#, elixir-format #: bundles/link/lib/index.ex:53 msgid "link.message.interested" msgstr "Interested? Sent an email to " diff --git a/core/priv/gettext/en/LC_MESSAGES/eyra-promotion.po b/core/priv/gettext/en/LC_MESSAGES/eyra-promotion.po index 7dbedb561..d6ba7cb1e 100644 --- a/core/priv/gettext/en/LC_MESSAGES/eyra-promotion.po +++ b/core/priv/gettext/en/LC_MESSAGES/eyra-promotion.po @@ -22,32 +22,32 @@ msgid "back.button.label" msgstr "Back to overview" #, elixir-format -#: lib/core_web/live/promotion/form.ex:153 +#: lib/core_web/live/promotion/form.ex:148 msgid "banner.subtitle.label" msgstr "Subtitle" #, elixir-format -#: lib/core_web/live/promotion/form.ex:140 +#: lib/core_web/live/promotion/form.ex:135 msgid "banner.title" msgstr "Banner" #, elixir-format -#: lib/core_web/live/promotion/form.ex:152 +#: lib/core_web/live/promotion/form.ex:147 msgid "banner.title.label" msgstr "Title" #, elixir-format -#: lib/core_web/live/promotion/form.ex:154 +#: lib/core_web/live/promotion/form.ex:149 msgid "banner.url.label" msgstr "Website" #, elixir-format -#: lib/core_web/live/promotion/form.ex:146 +#: lib/core_web/live/promotion/form.ex:141 msgid "choose.banner.photo.file" msgstr "Choose photo" #, elixir-format -#: lib/core_web/live/promotion/form.ex:147 +#: lib/core_web/live/promotion/form.ex:142 msgid "choose.other.banner.photo.file" msgstr "Choose different photo" @@ -57,7 +57,7 @@ msgid "deadline.label" msgstr "Still %{days} days available" #, elixir-format -#: lib/core_web/live/promotion/form.ex:137 +#: lib/core_web/live/promotion/form.ex:132 msgid "description.label" msgstr "Some background information for the participants" @@ -67,7 +67,7 @@ msgid "description.public.label" msgstr "Some background information for the participants" #, elixir-format -#: lib/core_web/live/promotion/form.ex:136 +#: lib/core_web/live/promotion/form.ex:131 msgid "description.title" msgstr "About the study" @@ -83,7 +83,7 @@ msgid "duration.title" msgstr "Expected duration" #, elixir-format -#: lib/core_web/live/promotion/form.ex:133 +#: lib/core_web/live/promotion/form.ex:128 msgid "expectations.label" msgstr "Expectations for the participants" @@ -93,17 +93,17 @@ msgid "expectations.public.label" msgstr "Expectations for the participants" #, elixir-format -#: lib/core_web/live/promotion/form.ex:132 +#: lib/core_web/live/promotion/form.ex:127 msgid "expectations.title" msgstr "About the task" #, elixir-format -#: lib/core_web/live/promotion/form.ex:121 +#: lib/core_web/live/promotion/form.ex:116 msgid "image.label" msgstr "The selected image will be visible in the marketplace overview and on promotion page" #, elixir-format -#: lib/core_web/live/promotion/form.ex:120 +#: lib/core_web/live/promotion/form.ex:115 msgid "image.title" msgstr "Image" @@ -134,31 +134,31 @@ msgid "reward.title" msgstr "Credits" #, elixir-format -#: lib/core_web/live/promotion/form.ex:127 +#: lib/core_web/live/promotion/form.ex:122 msgid "search.different.image.button" msgstr "Select image" #, elixir-format -#: lib/core_web/live/promotion/form.ex:111 +#: lib/core_web/live/promotion/form.ex:106 msgid "subtitle.label" msgstr "Subtitle" #, elixir-format -#: lib/core_web/live/promotion/form.ex:115 +#: lib/core_web/live/promotion/form.ex:110 msgid "themes.label" msgstr "Select one or more themes." #, elixir-format -#: lib/core_web/live/promotion/form.ex:114 +#: lib/core_web/live/promotion/form.ex:109 msgid "themes.title" msgstr "Themes" #, elixir-format -#: lib/core_web/live/promotion/form.ex:110 +#: lib/core_web/live/promotion/form.ex:105 msgid "title.label" msgstr "Title" #, elixir-format -#: lib/core_web/live/promotion/form.ex:108 +#: lib/core_web/live/promotion/form.ex:103 msgid "form.title" msgstr "Promotion" diff --git a/core/priv/gettext/en/LC_MESSAGES/eyra-support.po b/core/priv/gettext/en/LC_MESSAGES/eyra-support.po index 13682104d..c421e49eb 100644 --- a/core/priv/gettext/en/LC_MESSAGES/eyra-support.po +++ b/core/priv/gettext/en/LC_MESSAGES/eyra-support.po @@ -12,36 +12,36 @@ msgstr "" "Plural-Forms: nplurals=2\n" #, elixir-format -#: lib/core_web/live/support.ex:64 +#: lib/core_web/live/support.ex:57 msgid "form.description" msgstr "Fill out the form to create a support ticket. We will get back to you via email." #, elixir-format -#: lib/core_web/live/support.ex:63 +#: lib/core_web/live/support.ex:56 msgid "form.title" msgstr "Create Support Ticket" #, elixir-format -#: lib/core_web/live/support.ex:70 +#: lib/core_web/live/support.ex:63 msgid "ticket.description.label" msgstr "Description of your support request" #, elixir-format -#: lib/core_web/live/support.ex:68 +#: lib/core_web/live/support.ex:61 msgid "ticket.title.label" msgstr "Short title for your support request" #, elixir-format -#: lib/core_web/live/support.ex:58 +#: lib/core_web/live/support.ex:52 msgid "title" msgstr "Support" #, elixir-format -#: lib/core_web/live/support.ex:72 +#: lib/core_web/live/support.ex:65 msgid "create_ticket.button" msgstr "Submit" #, elixir-format -#: lib/core_web/live/support.ex:39 +#: lib/core_web/live/support.ex:33 msgid "ticket_created.info.flash" msgstr "" diff --git a/core/priv/gettext/en/LC_MESSAGES/eyra-ui.po b/core/priv/gettext/en/LC_MESSAGES/eyra-ui.po index a5a505f83..ec1a96739 100644 --- a/core/priv/gettext/en/LC_MESSAGES/eyra-ui.po +++ b/core/priv/gettext/en/LC_MESSAGES/eyra-ui.po @@ -145,3 +145,8 @@ msgstr "Welcome" #: translations.ex:2 msgid "menu.item.link" msgstr "Panl" + +#, elixir-format, fuzzy +#: lib/core_web/live/menu/items_translations.ex:2 +msgid "menu.item.support" +msgstr "Sign out" diff --git a/core/priv/gettext/en/LC_MESSAGES/link-survey.po b/core/priv/gettext/en/LC_MESSAGES/link-survey.po index fbe738f04..2ee255c12 100644 --- a/core/priv/gettext/en/LC_MESSAGES/link-survey.po +++ b/core/priv/gettext/en/LC_MESSAGES/link-survey.po @@ -123,7 +123,7 @@ msgid "status.label" msgstr "Below you can keep an eye on the progress campaign" #, elixir-format -#: bundles/link/lib/survey/web/content.ex:177 +#: bundles/link/lib/survey/web/content.ex:182 msgid "content.title" msgstr "Campaign" @@ -153,17 +153,17 @@ msgid "empty.title" msgstr "Campaigns you create will appear here" #, elixir-format -#: bundles/link/lib/survey/web/content.ex:120 +#: bundles/link/lib/survey/web/content.ex:122 msgid "tabbar.item.monitor" msgstr "Participants" #, elixir-format -#: bundles/link/lib/survey/web/content.ex:86 +#: bundles/link/lib/survey/web/content.ex:88 msgid "tabbar.item.promotion" msgstr "Promotion" #, elixir-format -#: bundles/link/lib/survey/web/content.ex:97 +#: bundles/link/lib/survey/web/content.ex:99 msgid "tabbar.item.survey" msgstr "Study" @@ -178,27 +178,27 @@ msgid "monitor.empty.title" msgstr "Information about the participants will appear here" #, elixir-format -#: bundles/link/lib/survey/web/content.ex:87 +#: bundles/link/lib/survey/web/content.ex:89 msgid "tabbar.item.promotion.forward" msgstr "Create promotion" #, elixir-format -#: bundles/link/lib/survey/web/content.ex:98 +#: bundles/link/lib/survey/web/content.ex:100 msgid "tabbar.item.survey.forward" msgstr "Link your online study" #, elixir-format -#: bundles/link/lib/survey/web/content.ex:121 +#: bundles/link/lib/survey/web/content.ex:123 msgid "tabbar.item.monitor.forward" msgstr "View participants" #, elixir-format -#: bundles/link/lib/survey/web/content.ex:109 +#: bundles/link/lib/survey/web/content.ex:111 msgid "tabbar.item.criteria" msgstr "Student pool" #, elixir-format -#: bundles/link/lib/survey/web/content.ex:110 +#: bundles/link/lib/survey/web/content.ex:112 msgid "tabbar.item.criteria.forward" msgstr "Submit campaign" diff --git a/core/priv/gettext/eyra-account.pot b/core/priv/gettext/eyra-account.pot index 241aea9e6..6f49fb766 100644 --- a/core/priv/gettext/eyra-account.pot +++ b/core/priv/gettext/eyra-account.pot @@ -96,12 +96,12 @@ msgid "push.registration.title" msgstr "" #, elixir-format -#: lib/core_web/live/user/settings.ex:50 +#: lib/core_web/live/user/settings.ex:52 msgid "push.registration.activated" msgstr "" #, elixir-format -#: lib/core_web/live/user/settings.ex:47 +#: lib/core_web/live/user/settings.ex:48 msgid "push.registration.denied" msgstr "" @@ -111,12 +111,12 @@ msgid "push.registration.label" msgstr "" #, elixir-format -#: lib/core_web/live/user/settings.ex:46 +#: lib/core_web/live/user/settings.ex:47 msgid "push.registration.pending" msgstr "" #, elixir-format -#: lib/core_web/live/user/settings.ex:52 +#: lib/core_web/live/user/settings.ex:54 msgid "push.registration.test.button" msgstr "" @@ -169,3 +169,8 @@ msgstr "" #: bundles/link/lib/pool/form/submission.ex:146 msgid "features.content.description" msgstr "" + +#, elixir-format +#: lib/core_web/live/user/settings.ex:49 +msgid "push.registration.unavailable" +msgstr "" diff --git a/core/priv/gettext/eyra-imagecatalog.pot b/core/priv/gettext/eyra-imagecatalog.pot index c2e64521c..af186e223 100644 --- a/core/priv/gettext/eyra-imagecatalog.pot +++ b/core/priv/gettext/eyra-imagecatalog.pot @@ -11,29 +11,29 @@ msgid "" msgstr "" #, elixir-format -#: lib/core_web/image_catalog_picker.ex:38 +#: lib/core_web/image_catalog_picker.ex:147 msgid "no.results.found.message" msgstr "" #, elixir-format -#: lib/core_web/image_catalog_picker.ex:33 +#: lib/core_web/image_catalog_picker.ex:142 msgid "search.image.button" msgstr "" #, elixir-format -#: lib/core_web/image_catalog_picker.ex:22 +#: lib/core_web/image_catalog_picker.ex:131 msgid "search.image.title" msgstr "" #, elixir-format -#: lib/core_web/image_catalog_picker.ex:42 +#: lib/core_web/image_catalog_picker.ex:151 msgid "images.found.message" msgid_plural "images.found.message.%{count}" msgstr[0] "" msgstr[1] "" #, elixir-format -#: lib/core_web/image_catalog_picker.ex:73 +#: lib/core_web/image_catalog_picker.ex:161 msgid "page.info.message" msgid_plural "page.info.message.%{count}" msgstr[0] "" diff --git a/core/priv/gettext/eyra-promotion.pot b/core/priv/gettext/eyra-promotion.pot index 18246a576..0fb59d8b1 100644 --- a/core/priv/gettext/eyra-promotion.pot +++ b/core/priv/gettext/eyra-promotion.pot @@ -21,32 +21,32 @@ msgid "back.button.label" msgstr "" #, elixir-format -#: lib/core_web/live/promotion/form.ex:153 +#: lib/core_web/live/promotion/form.ex:148 msgid "banner.subtitle.label" msgstr "" #, elixir-format -#: lib/core_web/live/promotion/form.ex:140 +#: lib/core_web/live/promotion/form.ex:135 msgid "banner.title" msgstr "" #, elixir-format -#: lib/core_web/live/promotion/form.ex:152 +#: lib/core_web/live/promotion/form.ex:147 msgid "banner.title.label" msgstr "" #, elixir-format -#: lib/core_web/live/promotion/form.ex:154 +#: lib/core_web/live/promotion/form.ex:149 msgid "banner.url.label" msgstr "" #, elixir-format -#: lib/core_web/live/promotion/form.ex:146 +#: lib/core_web/live/promotion/form.ex:141 msgid "choose.banner.photo.file" msgstr "" #, elixir-format -#: lib/core_web/live/promotion/form.ex:147 +#: lib/core_web/live/promotion/form.ex:142 msgid "choose.other.banner.photo.file" msgstr "" @@ -56,7 +56,7 @@ msgid "deadline.label" msgstr "" #, elixir-format -#: lib/core_web/live/promotion/form.ex:137 +#: lib/core_web/live/promotion/form.ex:132 msgid "description.label" msgstr "" @@ -66,7 +66,7 @@ msgid "description.public.label" msgstr "" #, elixir-format -#: lib/core_web/live/promotion/form.ex:136 +#: lib/core_web/live/promotion/form.ex:131 msgid "description.title" msgstr "" @@ -82,7 +82,7 @@ msgid "duration.title" msgstr "" #, elixir-format -#: lib/core_web/live/promotion/form.ex:133 +#: lib/core_web/live/promotion/form.ex:128 msgid "expectations.label" msgstr "" @@ -92,17 +92,17 @@ msgid "expectations.public.label" msgstr "" #, elixir-format -#: lib/core_web/live/promotion/form.ex:132 +#: lib/core_web/live/promotion/form.ex:127 msgid "expectations.title" msgstr "" #, elixir-format -#: lib/core_web/live/promotion/form.ex:121 +#: lib/core_web/live/promotion/form.ex:116 msgid "image.label" msgstr "" #, elixir-format -#: lib/core_web/live/promotion/form.ex:120 +#: lib/core_web/live/promotion/form.ex:115 msgid "image.title" msgstr "" @@ -133,31 +133,31 @@ msgid "reward.title" msgstr "" #, elixir-format -#: lib/core_web/live/promotion/form.ex:127 +#: lib/core_web/live/promotion/form.ex:122 msgid "search.different.image.button" msgstr "" #, elixir-format -#: lib/core_web/live/promotion/form.ex:111 +#: lib/core_web/live/promotion/form.ex:106 msgid "subtitle.label" msgstr "" #, elixir-format -#: lib/core_web/live/promotion/form.ex:115 +#: lib/core_web/live/promotion/form.ex:110 msgid "themes.label" msgstr "" #, elixir-format -#: lib/core_web/live/promotion/form.ex:114 +#: lib/core_web/live/promotion/form.ex:109 msgid "themes.title" msgstr "" #, elixir-format -#: lib/core_web/live/promotion/form.ex:110 +#: lib/core_web/live/promotion/form.ex:105 msgid "title.label" msgstr "" #, elixir-format -#: lib/core_web/live/promotion/form.ex:108 +#: lib/core_web/live/promotion/form.ex:103 msgid "form.title" msgstr "" diff --git a/core/priv/gettext/eyra-support.pot b/core/priv/gettext/eyra-support.pot index c1efa1fd4..24eed73be 100644 --- a/core/priv/gettext/eyra-support.pot +++ b/core/priv/gettext/eyra-support.pot @@ -11,36 +11,36 @@ msgid "" msgstr "" #, elixir-format -#: lib/core_web/live/support.ex:64 +#: lib/core_web/live/support.ex:57 msgid "form.description" msgstr "" #, elixir-format -#: lib/core_web/live/support.ex:63 +#: lib/core_web/live/support.ex:56 msgid "form.title" msgstr "" #, elixir-format -#: lib/core_web/live/support.ex:70 +#: lib/core_web/live/support.ex:63 msgid "ticket.description.label" msgstr "" #, elixir-format -#: lib/core_web/live/support.ex:68 +#: lib/core_web/live/support.ex:61 msgid "ticket.title.label" msgstr "" #, elixir-format -#: lib/core_web/live/support.ex:58 +#: lib/core_web/live/support.ex:52 msgid "title" msgstr "" #, elixir-format -#: lib/core_web/live/support.ex:72 +#: lib/core_web/live/support.ex:65 msgid "create_ticket.button" msgstr "" #, elixir-format -#: lib/core_web/live/support.ex:39 +#: lib/core_web/live/support.ex:33 msgid "ticket_created.info.flash" msgstr "" diff --git a/core/priv/gettext/eyra-ui.pot b/core/priv/gettext/eyra-ui.pot index de6b4ceee..2b4471112 100644 --- a/core/priv/gettext/eyra-ui.pot +++ b/core/priv/gettext/eyra-ui.pot @@ -151,3 +151,8 @@ msgstr "" #: bundles/link/lib/menu/items-translations.ex:2 msgid "menu.item.link" msgstr "" + +#, elixir-format +#: lib/core_web/live/menu/items_translations.ex:2 +msgid "menu.item.support" +msgstr "" diff --git a/core/priv/gettext/link-survey.pot b/core/priv/gettext/link-survey.pot index be20f3258..d963653fe 100644 --- a/core/priv/gettext/link-survey.pot +++ b/core/priv/gettext/link-survey.pot @@ -122,7 +122,7 @@ msgid "status.label" msgstr "" #, elixir-format -#: bundles/link/lib/survey/web/content.ex:177 +#: bundles/link/lib/survey/web/content.ex:182 msgid "content.title" msgstr "" @@ -152,17 +152,17 @@ msgid "empty.title" msgstr "" #, elixir-format -#: bundles/link/lib/survey/web/content.ex:120 +#: bundles/link/lib/survey/web/content.ex:122 msgid "tabbar.item.monitor" msgstr "" #, elixir-format -#: bundles/link/lib/survey/web/content.ex:86 +#: bundles/link/lib/survey/web/content.ex:88 msgid "tabbar.item.promotion" msgstr "" #, elixir-format -#: bundles/link/lib/survey/web/content.ex:97 +#: bundles/link/lib/survey/web/content.ex:99 msgid "tabbar.item.survey" msgstr "" @@ -177,27 +177,27 @@ msgid "monitor.empty.title" msgstr "" #, elixir-format -#: bundles/link/lib/survey/web/content.ex:87 +#: bundles/link/lib/survey/web/content.ex:89 msgid "tabbar.item.promotion.forward" msgstr "" #, elixir-format -#: bundles/link/lib/survey/web/content.ex:98 +#: bundles/link/lib/survey/web/content.ex:100 msgid "tabbar.item.survey.forward" msgstr "" #, elixir-format -#: bundles/link/lib/survey/web/content.ex:121 +#: bundles/link/lib/survey/web/content.ex:123 msgid "tabbar.item.monitor.forward" msgstr "" #, elixir-format -#: bundles/link/lib/survey/web/content.ex:109 +#: bundles/link/lib/survey/web/content.ex:111 msgid "tabbar.item.criteria" msgstr "" #, elixir-format -#: bundles/link/lib/survey/web/content.ex:110 +#: bundles/link/lib/survey/web/content.ex:112 msgid "tabbar.item.criteria.forward" msgstr "" diff --git a/core/priv/gettext/nl/LC_MESSAGES/eyra-account.po b/core/priv/gettext/nl/LC_MESSAGES/eyra-account.po index e7b8917f5..2dab65a3f 100644 --- a/core/priv/gettext/nl/LC_MESSAGES/eyra-account.po +++ b/core/priv/gettext/nl/LC_MESSAGES/eyra-account.po @@ -97,12 +97,12 @@ msgid "push.registration.title" msgstr "Push notificaties" #, elixir-format -#: lib/core_web/live/user/settings.ex:50 +#: lib/core_web/live/user/settings.ex:52 msgid "push.registration.activated" msgstr "Push notificaties zijn geactiveerd op deze browser" #, elixir-format -#: lib/core_web/live/user/settings.ex:47 +#: lib/core_web/live/user/settings.ex:48 msgid "push.registration.denied" msgstr "Push notificaties zijn gedeactiveerd op deze browser" @@ -112,12 +112,12 @@ msgid "push.registration.label" msgstr "Activeren op deze browser" #, elixir-format -#: lib/core_web/live/user/settings.ex:46 +#: lib/core_web/live/user/settings.ex:47 msgid "push.registration.pending" msgstr "Push notificaties zijn gedeactiveerd op deze browser" #, elixir-format -#: lib/core_web/live/user/settings.ex:52 +#: lib/core_web/live/user/settings.ex:54 msgid "push.registration.test.button" msgstr "Stuur test notificatie" @@ -170,3 +170,8 @@ msgstr "Studenten van de geselecteerd opleidingen komen in aanmerking. Geen sele #: bundles/link/lib/pool/form/submission.ex:146 msgid "features.content.description" msgstr "Studenten met de geselecteerde kenmerken komen in aanmerking. Geen selectie betekend dat iedere student in aanmerking komt." + +#, elixir-format, fuzzy +#: lib/core_web/live/user/settings.ex:49 +msgid "push.registration.unavailable" +msgstr "Notificaties zijn (nog) niet beschikbaar voor jouw browser. Firefox, Chrome of Edge worden ondersteund." diff --git a/core/priv/gettext/nl/LC_MESSAGES/eyra-imagecatalog.po b/core/priv/gettext/nl/LC_MESSAGES/eyra-imagecatalog.po index d070abb7b..c995db1bb 100644 --- a/core/priv/gettext/nl/LC_MESSAGES/eyra-imagecatalog.po +++ b/core/priv/gettext/nl/LC_MESSAGES/eyra-imagecatalog.po @@ -12,29 +12,29 @@ msgstr "" "Plural-Forms: nplurals=2\n" #, elixir-format -#: lib/core_web/image_catalog_picker.ex:38 +#: lib/core_web/image_catalog_picker.ex:147 msgid "no.results.found.message" msgstr "Geen afbeeldingen gevonden" #, elixir-format -#: lib/core_web/image_catalog_picker.ex:33 +#: lib/core_web/image_catalog_picker.ex:142 msgid "search.image.button" msgstr "Zoek" #, elixir-format -#: lib/core_web/image_catalog_picker.ex:22 +#: lib/core_web/image_catalog_picker.ex:131 msgid "search.image.title" msgstr "Zoek een afbeelding" #, elixir-format -#: lib/core_web/image_catalog_picker.ex:42 +#: lib/core_web/image_catalog_picker.ex:151 msgid "images.found.message" msgid_plural "images.found.message.%{count}" msgstr[0] "1 afbeelding:" msgstr[1] "%{count} afbeeldingen:" #, elixir-format -#: lib/core_web/image_catalog_picker.ex:73 +#: lib/core_web/image_catalog_picker.ex:161 msgid "page.info.message" msgid_plural "page.info.message.%{count}" msgstr[0] "1 afbeelding" diff --git a/core/priv/gettext/nl/LC_MESSAGES/eyra-link.po b/core/priv/gettext/nl/LC_MESSAGES/eyra-link.po index e557bb049..0db76488a 100644 --- a/core/priv/gettext/nl/LC_MESSAGES/eyra-link.po +++ b/core/priv/gettext/nl/LC_MESSAGES/eyra-link.po @@ -91,7 +91,7 @@ msgstr "Voor onderzoek" msgid "marketplace-button" msgstr "Naar de marktplaats" -#, elixir-format, fuzzy +#, elixir-format #: bundles/link/lib/index.ex:53 msgid "link.message.interested" msgstr "Meer weten? Stuur een e-mail naar " diff --git a/core/priv/gettext/nl/LC_MESSAGES/eyra-promotion.po b/core/priv/gettext/nl/LC_MESSAGES/eyra-promotion.po index c8a745801..7f7bc74b9 100644 --- a/core/priv/gettext/nl/LC_MESSAGES/eyra-promotion.po +++ b/core/priv/gettext/nl/LC_MESSAGES/eyra-promotion.po @@ -22,32 +22,32 @@ msgid "back.button.label" msgstr "Terug naar overzicht" #, elixir-format -#: lib/core_web/live/promotion/form.ex:153 +#: lib/core_web/live/promotion/form.ex:148 msgid "banner.subtitle.label" msgstr "Ondertitel" #, elixir-format -#: lib/core_web/live/promotion/form.ex:140 +#: lib/core_web/live/promotion/form.ex:135 msgid "banner.title" msgstr "Banner" #, elixir-format -#: lib/core_web/live/promotion/form.ex:152 +#: lib/core_web/live/promotion/form.ex:147 msgid "banner.title.label" msgstr "Titel" #, elixir-format -#: lib/core_web/live/promotion/form.ex:154 +#: lib/core_web/live/promotion/form.ex:149 msgid "banner.url.label" msgstr "Website" #, elixir-format -#: lib/core_web/live/promotion/form.ex:146 +#: lib/core_web/live/promotion/form.ex:141 msgid "choose.banner.photo.file" msgstr "Kies foto" #, elixir-format -#: lib/core_web/live/promotion/form.ex:147 +#: lib/core_web/live/promotion/form.ex:142 msgid "choose.other.banner.photo.file" msgstr "Kies andere foto" @@ -57,7 +57,7 @@ msgid "deadline.label" msgstr "Nog %{days} dagen beschikbaar" #, elixir-format -#: lib/core_web/live/promotion/form.ex:137 +#: lib/core_web/live/promotion/form.ex:132 msgid "description.label" msgstr "Achtergrond informatie voor de participanten" @@ -67,7 +67,7 @@ msgid "description.public.label" msgstr "Achtergrond informatie voor de participanten" #, elixir-format -#: lib/core_web/live/promotion/form.ex:136 +#: lib/core_web/live/promotion/form.ex:131 msgid "description.title" msgstr "Over het onderzoek" @@ -83,7 +83,7 @@ msgid "duration.title" msgstr "Verwachte duur" #, elixir-format -#: lib/core_web/live/promotion/form.ex:133 +#: lib/core_web/live/promotion/form.ex:128 msgid "expectations.label" msgstr "Verwachtingen voor de participanten" @@ -93,17 +93,17 @@ msgid "expectations.public.label" msgstr "Verwachtingen voor de participanten" #, elixir-format -#: lib/core_web/live/promotion/form.ex:132 +#: lib/core_web/live/promotion/form.ex:127 msgid "expectations.title" msgstr "Over de taak" #, elixir-format -#: lib/core_web/live/promotion/form.ex:121 +#: lib/core_web/live/promotion/form.ex:116 msgid "image.label" msgstr "De gekozen afbeelding wordt zichtbaar in het marktplaats overzicht en op de campagne advertentie." #, elixir-format -#: lib/core_web/live/promotion/form.ex:120 +#: lib/core_web/live/promotion/form.ex:115 msgid "image.title" msgstr "Afbeelding" @@ -134,31 +134,31 @@ msgid "reward.title" msgstr "Beloning" #, elixir-format -#: lib/core_web/live/promotion/form.ex:127 +#: lib/core_web/live/promotion/form.ex:122 msgid "search.different.image.button" msgstr "Kies afbeelding" #, elixir-format -#: lib/core_web/live/promotion/form.ex:111 +#: lib/core_web/live/promotion/form.ex:106 msgid "subtitle.label" msgstr "Ondertitel" #, elixir-format -#: lib/core_web/live/promotion/form.ex:115 +#: lib/core_web/live/promotion/form.ex:110 msgid "themes.label" msgstr "Selecteer een of meerdere thema's." #, elixir-format -#: lib/core_web/live/promotion/form.ex:114 +#: lib/core_web/live/promotion/form.ex:109 msgid "themes.title" msgstr "Thema's" #, elixir-format -#: lib/core_web/live/promotion/form.ex:110 +#: lib/core_web/live/promotion/form.ex:105 msgid "title.label" msgstr "Titel" #, elixir-format -#: lib/core_web/live/promotion/form.ex:108 +#: lib/core_web/live/promotion/form.ex:103 msgid "form.title" msgstr "Advertentie" diff --git a/core/priv/gettext/nl/LC_MESSAGES/eyra-support.po b/core/priv/gettext/nl/LC_MESSAGES/eyra-support.po index c757a86a4..aa55681c3 100644 --- a/core/priv/gettext/nl/LC_MESSAGES/eyra-support.po +++ b/core/priv/gettext/nl/LC_MESSAGES/eyra-support.po @@ -12,36 +12,36 @@ msgstr "" "Plural-Forms: nplurals=2\n" #, elixir-format -#: lib/core_web/live/support.ex:64 +#: lib/core_web/live/support.ex:57 msgid "form.description" msgstr "Vul het formulier in om een vraag te stellen. We zullen bij / na behandeling contact met je opnemen via email." #, elixir-format -#: lib/core_web/live/support.ex:63 +#: lib/core_web/live/support.ex:56 msgid "form.title" msgstr "Maak ondersteuningsvraag" #, elixir-format -#: lib/core_web/live/support.ex:70 +#: lib/core_web/live/support.ex:63 msgid "ticket.description.label" msgstr "Uitleg van je ondersteuningsvraag" #, elixir-format -#: lib/core_web/live/support.ex:68 +#: lib/core_web/live/support.ex:61 msgid "ticket.title.label" msgstr "Korte beschrijving van je vraag" #, elixir-format -#: lib/core_web/live/support.ex:58 +#: lib/core_web/live/support.ex:52 msgid "title" msgstr "Ondersteuning" #, elixir-format -#: lib/core_web/live/support.ex:72 +#: lib/core_web/live/support.ex:65 msgid "create_ticket.button" msgstr "Verstuur" #, elixir-format -#: lib/core_web/live/support.ex:39 +#: lib/core_web/live/support.ex:33 msgid "ticket_created.info.flash" msgstr "" diff --git a/core/priv/gettext/nl/LC_MESSAGES/eyra-ui.po b/core/priv/gettext/nl/LC_MESSAGES/eyra-ui.po index 26e49e1c8..137b60ad7 100644 --- a/core/priv/gettext/nl/LC_MESSAGES/eyra-ui.po +++ b/core/priv/gettext/nl/LC_MESSAGES/eyra-ui.po @@ -145,3 +145,8 @@ msgstr "Welkom" #: translations.ex:2 msgid "menu.item.link" msgstr "Panl" + +#, elixir-format, fuzzy +#: lib/core_web/live/menu/items_translations.ex:2 +msgid "menu.item.support" +msgstr "Uitloggen" diff --git a/core/priv/gettext/nl/LC_MESSAGES/link-survey.po b/core/priv/gettext/nl/LC_MESSAGES/link-survey.po index e0bc26eca..4f2dd8274 100644 --- a/core/priv/gettext/nl/LC_MESSAGES/link-survey.po +++ b/core/priv/gettext/nl/LC_MESSAGES/link-survey.po @@ -123,7 +123,7 @@ msgid "status.label" msgstr "Hieronder kan je in gaten houden hoe de campagne verloopt" #, elixir-format -#: bundles/link/lib/survey/web/content.ex:177 +#: bundles/link/lib/survey/web/content.ex:182 msgid "content.title" msgstr "Campagne" @@ -153,17 +153,17 @@ msgid "empty.title" msgstr "Hier vind je een overzicht van je campagnes" #, elixir-format -#: bundles/link/lib/survey/web/content.ex:120 +#: bundles/link/lib/survey/web/content.ex:122 msgid "tabbar.item.monitor" msgstr "Deelnemers" #, elixir-format -#: bundles/link/lib/survey/web/content.ex:86 +#: bundles/link/lib/survey/web/content.ex:88 msgid "tabbar.item.promotion" msgstr "Advertentie" #, elixir-format -#: bundles/link/lib/survey/web/content.ex:97 +#: bundles/link/lib/survey/web/content.ex:99 msgid "tabbar.item.survey" msgstr "Studie" @@ -178,27 +178,27 @@ msgid "monitor.empty.title" msgstr "Hier komt informatie over de deelnemers" #, elixir-format -#: bundles/link/lib/survey/web/content.ex:87 +#: bundles/link/lib/survey/web/content.ex:89 msgid "tabbar.item.promotion.forward" msgstr "Maak advertentie aan" #, elixir-format -#: bundles/link/lib/survey/web/content.ex:98 +#: bundles/link/lib/survey/web/content.ex:100 msgid "tabbar.item.survey.forward" msgstr "Koppel je studie" #, elixir-format -#: bundles/link/lib/survey/web/content.ex:121 +#: bundles/link/lib/survey/web/content.ex:123 msgid "tabbar.item.monitor.forward" msgstr "Bekijk deelnemers" #, elixir-format -#: bundles/link/lib/survey/web/content.ex:109 +#: bundles/link/lib/survey/web/content.ex:111 msgid "tabbar.item.criteria" msgstr "Studentenpool" #, elixir-format -#: bundles/link/lib/survey/web/content.ex:110 +#: bundles/link/lib/survey/web/content.ex:112 msgid "tabbar.item.criteria.forward" msgstr "Campagne indienen"