From 4a109685b0b6c8a50f3b9237f085d82e5ae56d4b Mon Sep 17 00:00:00 2001
From: Julian Gonggrijp <dev@juliangonggrijp.com>
Date: Fri, 29 Apr 2022 01:25:01 +0200
Subject: [PATCH] Replace _ by - in i18n keys (#451)

The underscore is the context and number separator in i18next. At the
time of writing we are not using this anywhere yet. To avoid confusion,
use a dash as a word separator.
---
 .../src/explorer/explorer-event-controller.ts |  10 +-
 frontend/src/feedback/feedback-template.hbs   |  10 +-
 frontend/src/footer/footer-template.hbs       |   2 +-
 .../forms/ontology-class-picker-template.hbs  |   2 +-
 frontend/src/i18n/en/translation.json         | 182 +++++++++---------
 frontend/src/i18n/fr/translation.json         | 182 +++++++++---------
 .../item-edit/allowed-type-list-template.hbs  |   4 +-
 .../item-edit/detected-type-help-template.hbs |   2 +-
 .../item-edit/linked-item-editor-template.hbs |   4 +-
 .../src/item-metadata/item-metadata-view.ts   |   2 +-
 frontend/src/landing/landing-template.hbs     |  12 +-
 frontend/src/login/login-template.hbs         |   4 +-
 frontend/src/menu/menu-template.hbs           |  18 +-
 .../src/notfound404/notfound-template.hbs     |   4 +-
 .../src/pagination/pagination-template.hbs    |   4 +-
 .../annotation-list-panel-template.hbs        |   4 +-
 .../annotation-edit-template.hbs              |  24 +--
 .../panel-annotation/annotation-template.hbs  |  20 +-
 .../src/panel-annotation/annotation-view.ts   |   2 +-
 .../external-resources-edit-view.ts           |   2 +-
 .../external-resources-template.hbs           |   4 +-
 .../related-items-edit-view.ts                |   2 +-
 .../related-items-template.hbs                |   4 +-
 .../search-result-item-template.hbs           |   2 +-
 .../search-result-list-panel.ts               |   2 +-
 .../source-list-panel-template.hbs            |   2 +-
 .../source-list-template.hbs                  |   2 +-
 .../panel-source/source-metadata-template.hbs |   6 +-
 .../src/panel-source/source-metadata-view.ts  |   2 +-
 .../confirm-registration-template.hbs         |  14 +-
 .../registration/registration-template.hbs    |  12 +-
 .../src/search-box/searchbox-template.hbs     |   4 +-
 .../semantic-search-template.hbs              |   2 +-
 frontend/src/snippet/snippet-view.ts          |   2 +-
 frontend/src/toolbar/toolbar-template.hbs     |   4 +-
 .../src/upload/upload-source-template.hbs     |   2 +-
 36 files changed, 280 insertions(+), 280 deletions(-)

diff --git a/frontend/src/explorer/explorer-event-controller.ts b/frontend/src/explorer/explorer-event-controller.ts
index f5202a4f..3f101f30 100644
--- a/frontend/src/explorer/explorer-event-controller.ts
+++ b/frontend/src/explorer/explorer-event-controller.ts
@@ -311,14 +311,14 @@ class ExplorerEventController {
             landing = false;
         }
         const title = `${landing ? 'My' : 'Sample'} ${queryMode}`;
-        const i18nKey = title.toLowerCase().replace(' ', '_');
+        const i18nKey = title.toLowerCase().replace(' ', '-');
         const endpoint = `${queryMode}:${landing ? 'user' : 'sample'}`;
         const collection = new FlatItemCollection(ldChannel.request(endpoint));
         const browsePanel = new SearchResultListPanel({
-            // i18next.t('my_sources', 'My sources');
-            // i18next.t('sample_sources', 'Sample sources');
-            // i18next.t('my_items', 'My items');
-            // i18next.t('sample_items', 'Sample items');
+            // i18next.t('my-sources', 'My sources');
+            // i18next.t('sample-sources', 'Sample sources');
+            // i18next.t('my-items', 'My items');
+            // i18next.t('sample-items', 'Sample items');
             title: i18next.t(i18nKey, title),
             collection,
             selectable: false,
diff --git a/frontend/src/feedback/feedback-template.hbs b/frontend/src/feedback/feedback-template.hbs
index 1bcaf11b..bafa9985 100644
--- a/frontend/src/feedback/feedback-template.hbs
+++ b/frontend/src/feedback/feedback-template.hbs
@@ -3,10 +3,10 @@
     <form class="box register-form is-narrow-modal-form">
         {{#if wasSentSuccessfully}}
         <header>
-            <h3 class="title is-3 page-header">{{#i18n 'feedback_submitted'}}Feedback submitted{{/i18n}}</h3>
+            <h3 class="title is-3 page-header">{{#i18n 'feedback-submitted'}}Feedback submitted{{/i18n}}</h3>
         </header>
         <div class="field">
-            <p>{{#i18n 'thanks_feedback'}}Thank you very much for your feedback, it is highly appreciated!{{/i18n}}</p>
+            <p>{{#i18n 'thanks-feedback'}}Thank you very much for your feedback, it is highly appreciated!{{/i18n}}</p>
         </div>
         <div class="field is-grouped">
             <div class="control">
@@ -25,7 +25,7 @@
                     class="input"
                     type="text"
                     name="title"
-                    placeholder="{{#i18n 'about_readit'}}About READ-IT{{/i18n}}"
+                    placeholder="{{#i18n 'about-readit'}}About READ-IT{{/i18n}}"
                 >
             </div>
         </div>
@@ -36,14 +36,14 @@
                 <textarea
                     name="feedback"
                     class="textarea"
-                    placeholder="{{#i18n 'feedback_placeholder'}}e.g. I love READ-IT!{{/i18n}}"
+                    placeholder="{{#i18n 'feedback-placeholder'}}e.g. I love READ-IT!{{/i18n}}"
                 ></textarea>
             </div>
         </div>
 
         {{#if hasError}}
         <div class="field form-feedback-bar has-background-danger has-text-white">
-            <p class="help">{{#i18n 'feedback_failed'}}Feedback submission failed. Please try again and if this error keeps occuring, contact the
+            <p class="help">{{#i18n 'feedback-failed'}}Feedback submission failed. Please try again and if this error keeps occuring, contact the
                 site administrator.{{/i18n}}</p>
         </div>
         {{/if}}
diff --git a/frontend/src/footer/footer-template.hbs b/frontend/src/footer/footer-template.hbs
index aa831782..d2f48057 100644
--- a/frontend/src/footer/footer-template.hbs
+++ b/frontend/src/footer/footer-template.hbs
@@ -1,5 +1,5 @@
 <figure class="footer-dh">
-    <p>{{#i18n 'developed_by'}}Developed by{{/i18n}}</p>
+    <p>{{#i18n 'developed-by'}}Developed by{{/i18n}}</p>
     <a href="https://dig.hum.uu.nl" target="_blank"><img class="dhlab"
             src="{{static 'image/dighum-logo-blue.svg'}}"></a>
     <div class="footer-project is-pulled-right">
diff --git a/frontend/src/forms/ontology-class-picker-template.hbs b/frontend/src/forms/ontology-class-picker-template.hbs
index 9fcf8c17..3da35bf7 100644
--- a/frontend/src/forms/ontology-class-picker-template.hbs
+++ b/frontend/src/forms/ontology-class-picker-template.hbs
@@ -1,7 +1,7 @@
 <div class="dropdown">
     <div class="dropdown-trigger">
         <button type=button class="button" aria-haspopup="true" aria-controls="dropdown-menu">
-            <span class="dropdown-label">{{#i18n 'define_category'}}This is a{{/i18n}}
+            <span class="dropdown-label">{{#i18n 'define-category'}}This is a{{/i18n}}
                 <span class="dropdown-label-tag">...</span>
             </span>
             <span class="icon is-small">
diff --git a/frontend/src/i18n/en/translation.json b/frontend/src/i18n/en/translation.json
index 1feca95f..5e2aca3e 100644
--- a/frontend/src/i18n/en/translation.json
+++ b/frontend/src/i18n/en/translation.json
@@ -2,22 +2,22 @@
     "heading": {
         "annotations": "Annotations"
     },
-    "my_sources": "My sources",
-    "sample_sources": "Sample sources",
-    "my_items": "My items",
-    "sample_items": "Sample items",
-    "feedback_submitted": "Feedback submitted",
-    "thanks_feedback": "Thank you very much for your feedback, it is highly appreciated!",
+    "my-sources": "My sources",
+    "sample-sources": "Sample sources",
+    "my-items": "My items",
+    "sample-items": "Sample items",
+    "feedback-submitted": "Feedback submitted",
+    "thanks-feedback": "Thank you very much for your feedback, it is highly appreciated!",
     "close": "Close",
     "feedback": "Feedback",
     "subject": "Subject",
-    "about_readit": "About READ-IT",
-    "feedback_placeholder": "e.g. I love READ-IT!",
-    "feedback_failed": "Feedback submission failed. Please try again and if this error keeps occuring, contact the\n                site administrator.",
+    "about-readit": "About READ-IT",
+    "feedback-placeholder": "e.g. I love READ-IT!",
+    "feedback-failed": "Feedback submission failed. Please try again and if this error keeps occuring, contact the\n                site administrator.",
     "submit": "Submit",
-    "developed_by": "Developed by",
+    "developed-by": "Developed by",
     "add": "Add",
-    "define_category": "This is a",
+    "define-category": "This is a",
     "remove": "Remove",
     "filterHierarchy": {
         "mine": "by me",
@@ -27,118 +27,118 @@
         "semantic": "human",
         "nlp": "automated"
     },
-    "permitted_types_before_list": "This property permits",
-    "current_type": "Current type:",
+    "permitted-types-before-list": "This property permits",
+    "current-type": "Current type:",
     "typeHints": {
         "integer": "Include extra leading zeros to force interpretation as an integer type.",
         "base64Binary": "Include internal whitespace to force interpretation as base 64 binary data.",
         "gYear": "Include time zone information (such as a final &ldquo;Z&rdquo;) to force interpretation as a Gregorian year.",
         "string": "Start with a space to force interpretation as text or a derived string type."
     },
-    "all_types_permitted": "This property permits any simple type.",
-    "no_type_matched": "This value does not match the permitted type(s).",
+    "all-types-permitted": "This property permits any simple type.",
+    "no-type-matched": "This value does not match the permitted type(s).",
     "name": "Name",
     "value": "Value",
-    "item_metadata": "Item metadata",
+    "item-metadata": "Item metadata",
     "interpunction": {
         "colon": ":",
-        "paragraph_ellipsis": "(...)"
+        "paragraph-ellipsis": "(...)"
     },
     "sources": "Sources",
-    "sources_tally": "You uploaded {{userSources}} of {{totalSources}} sources.",
-    "view_sources": "View your sources",
-    "explore_sources": "Explore sources",
+    "sources-tally": "You uploaded {{userSources}} of {{totalSources}} sources.",
+    "view-sources": "View your sources",
+    "explore-sources": "Explore sources",
     "items": "Items",
-    "items_tally": "You created {{userItems}} of {{totalItems}} items.",
-    "view_items": "View your items",
-    "explore_items": "Explore items",
+    "items-tally": "You created {{userItems}} of {{totalItems}} items.",
+    "view-items": "View your items",
+    "explore-items": "Explore items",
     "username": "Username",
     "password": "Password",
-    "login_failed": "That didn't work. Please try again.",
+    "login-failed": "That didn't work. Please try again.",
     "login": "Login",
     "cancel": "Cancel",
-    "no_account": "Don't have an account?",
-    "sign_up": "Sign up!",
-    "main_navigation": "main navigation",
+    "no-account": "Don't have an account?",
+    "sign-up": "Sign up!",
+    "main-navigation": "main navigation",
     "menu": "menu",
-    "about_tooltip": "Find out more about the READ-IT project",
+    "about-tooltip": "Find out more about the READ-IT project",
     "about": "About",
-    "search_tooltip": "Search reading experiences and annotations",
+    "search-tooltip": "Search reading experiences and annotations",
     "search": "Search",
-    "explore_tooltip": "Get a random selection of reading experiences and annotations",
+    "explore-tooltip": "Get a random selection of reading experiences and annotations",
     "explore": "Explore",
-    "upload_tooltip": "Upload reading testimonies for annotation",
+    "upload-tooltip": "Upload reading testimonies for annotation",
     "upload": "Upload",
-    "contribute_tooltip": "Find out how to contribute to READ-IT",
+    "contribute-tooltip": "Find out how to contribute to READ-IT",
     "contribute": "Contribute",
     "greeting": "Hello, {{username}}!",
     "landing-page": "Personal landing page",
     "feedback-tooltip": "Give us feedback on the interface",
-    "log_out": "Log out",
-    "not_found_alt": "404 Not Found",
-    "not_found_text": "Oops, this page doesn't seem to exist.\n    You can <a onclick=\"history.back()\">go back</a>,\n    visit <a href=\"/landing\">Landing</a> or <a href=\"/search\">Search</a>,\n    or report a problem to the maintainers.",
+    "log-out": "Log out",
+    "not-found-alt": "404 Not Found",
+    "not-found-text": "Oops, this page doesn't seem to exist.\n    You can <a onclick=\"history.back()\">go back</a>,\n    visit <a href=\"/landing\">Landing</a> or <a href=\"/search\">Search</a>,\n    or report a problem to the maintainers.",
     "pagination": "pagination",
-    "to_first_page": "Go to page 1",
-    "to_last_page": "Go to last page",
-    "annotations_title": "Annotations",
+    "to-first-page": "Go to page 1",
+    "to-last-page": "Go to last page",
+    "annotations-title": "Annotations",
     "filter": "Filter",
-    "export_annotations": "Export annotations",
-    "edit_annotation": "Edit Annotation",
-    "annotation_info": "(Find more info on what and how to annotate in\n            <a class=\"is-link\" href=\"http://dhstatic.hum.uu.nl/readit/AnnotationGuide.pdf\" target=\"_blank\"> the\n                Annotation Guide</a>",
-    "title_category": "Category",
-    "category_choice": "Choose a category before saving.",
-    "needs_verification": "Needs verification",
-    "label_choice": "Which one?",
-    "new_item_create": "Create new",
-    "edit_properties": "Edit properties",
-    "xsd_available_types_before_link": "See",
-    "xsd_available_types_link": "the XML Schema recommendation",
-    "xsd_available_types_after_link": "for an overview of the available types and their lexical representations.",
-    "preferred_label_choice": "Choose a preferred label before saving.",
+    "export-annotations": "Export annotations",
+    "edit-annotation": "Edit Annotation",
+    "annotation-info": "(Find more info on what and how to annotate in\n            <a class=\"is-link\" href=\"http://dhstatic.hum.uu.nl/readit/AnnotationGuide.pdf\" target=\"_blank\"> the\n                Annotation Guide</a>",
+    "title-category": "Category",
+    "category-choice": "Choose a category before saving.",
+    "needs-verification": "Needs verification",
+    "label-choice": "Which one?",
+    "new-item-create": "Create new",
+    "edit-properties": "Edit properties",
+    "xsd-available-types-before-link": "See",
+    "xsd-available-types-link": "the XML Schema recommendation",
+    "xsd-available-types-after-link": "for an overview of the available types and their lexical representations.",
+    "preferred-label-choice": "Choose a preferred label before saving.",
     "save": "Save",
     "delete": "Delete",
     "annotation": "Annotation",
-    "identified_as": "identified as",
+    "identified-as": "identified as",
     "item": "item",
-    "annotation_verification": "This annotation needs to be verified.",
-    "item_properties": "Item properties",
-    "related_items_title": "Related items",
-    "open_related": "Open related items",
-    "other_annotations_title": "Other annotations",
-    "open_annotations": "Open annotations",
-    "external_resources_title": "External resources",
-    "open_external": "Open external resources",
+    "annotation-verification": "This annotation needs to be verified.",
+    "item-properties": "Item properties",
+    "related-items-title": "Related items",
+    "open-related": "Open related items",
+    "other-annotations-title": "Other annotations",
+    "open-annotations": "Open annotations",
+    "external-resources-title": "External resources",
+    "open-external": "Open external resources",
     "edit": "Edit",
     "new": "New",
-    "annotation_metadata": "Annotation metadata",
-    "edit_external_resources": "Edit external resources",
-    "for_item": "For item",
-    "edit_related_items": "Edit related items",
-    "no_details": "No further details",
-    "search_results": "Search Results",
-    "source_title_many": "Sources",
-    "no_search_results": "No search results.",
-    "source_metadata_title": "Source metadata",
-    "properties_title": "Properties",
-    "delete_source": "Delete source",
-    "source_delete_confirm": "\nAre you sure you want to delete this source?\nIf you delete this source, all its annotation will be deleted as well, including any annotations that other users may have made.\nThis cannot be undone.\n",
-    "confirmation_complete": "Confirmation complete",
-    "sign_up_thanks_before_link": "Thank you for signing up. You can now",
-    "sign_up_thanks_link": "login",
-    "sign_up_thanks_after_link": ".",
-    "confirmation_failed": "Confirmation failed",
-    "token_expiration": "This is probably due to token expiration.",
-    "try_confirm_again": "Please try again and if this error keeps occuring, contact the site administrator.",
-    "registration_finished": "Registration finished succesfully!",
-    "activate_account": "Please activate your account via the link in the mail we just sent you.",
-    "find_email": "Make sure to check your 'Spam' folder if you can't find the email in your inbox.",
-    "close_window": "You can now close this window.",
+    "annotation-metadata": "Annotation metadata",
+    "edit-external-resources": "Edit external resources",
+    "for-item": "For item",
+    "edit-related-items": "Edit related items",
+    "no-details": "No further details",
+    "search-results": "Search Results",
+    "source-title-many": "Sources",
+    "no-search-results": "No search results.",
+    "source-metadata-title": "Source metadata",
+    "properties-title": "Properties",
+    "delete-source": "Delete source",
+    "source-delete-confirm": "\nAre you sure you want to delete this source?\nIf you delete this source, all its annotation will be deleted as well, including any annotations that other users may have made.\nThis cannot be undone.\n",
+    "confirmation-complete": "Confirmation complete",
+    "sign-up-thanks-before-link": "Thank you for signing up. You can now",
+    "sign-up-thanks-link": "login",
+    "sign-up-thanks-after-link": ".",
+    "confirmation-failed": "Confirmation failed",
+    "token-expiration": "This is probably due to token expiration.",
+    "try-confirm-again": "Please try again and if this error keeps occuring, contact the site administrator.",
+    "registration-finished": "Registration finished succesfully!",
+    "activate-account": "Please activate your account via the link in the mail we just sent you.",
+    "find-email": "Make sure to check your 'Spam' folder if you can't find the email in your inbox.",
+    "close-window": "You can now close this window.",
     "register": "Register",
     "email": "Email",
-    "repeat_password": "Repeat password",
-    "registration_failed": "Registration failed. Please try again and if this error keeps occuring, contact the site administrator.",
-    "view_operator_docs": "View documentation of search operators",
-    "search_database": "Search our database",
+    "repeat-password": "Repeat password",
+    "registration-failed": "Registration failed. Please try again and if this error keeps occuring, contact the site administrator.",
+    "view-operator-docs": "View documentation of search operators",
+    "search-database": "Search our database",
     "filters": {
         "and": "AND",
         "or": "OR",
@@ -157,11 +157,11 @@
         "groupPredicates": "traverse predicate"
     },
     "semsearch-subtitle": "Find linked data items based on semantic features",
-    "optional_label_placeholder": "optional label for reference",
+    "optional-label-placeholder": "optional label for reference",
     "semsearch-submit": "Search",
-    "show_hide_metadata": "Show / hide the source metadata",
-    "show_hide_annotations": "Show / hide annotations",
-    "upload_source": "Upload source",
+    "show-hide-metadata": "Show / hide the source metadata",
+    "show-hide-annotations": "Show / hide annotations",
+    "upload-source": "Upload source",
     "title": "Title",
     "author": "Author",
     "editor": "Editor (optional)",
diff --git a/frontend/src/i18n/fr/translation.json b/frontend/src/i18n/fr/translation.json
index a03e5bbc..18475ece 100644
--- a/frontend/src/i18n/fr/translation.json
+++ b/frontend/src/i18n/fr/translation.json
@@ -2,22 +2,22 @@
     "heading": {
         "annotations": "Annotations"
     },
-    "my_sources": "My sources",
-    "sample_sources": "Sample sources",
-    "my_items": "My items",
-    "sample_items": "Sample items",
-    "feedback_submitted": "Feedback submitted",
-    "thanks_feedback": "Thank you very much for your feedback, it is highly appreciated!",
+    "my-sources": "My sources",
+    "sample-sources": "Sample sources",
+    "my-items": "My items",
+    "sample-items": "Sample items",
+    "feedback-submitted": "Feedback submitted",
+    "thanks-feedback": "Thank you very much for your feedback, it is highly appreciated!",
     "close": "Close",
     "feedback": "Feedback",
     "subject": "Subject",
-    "about_readit": "About READ-IT",
-    "feedback_placeholder": "e.g. I love READ-IT!",
-    "feedback_failed": "Feedback submission failed. Please try again and if this error keeps occuring, contact the\n                site administrator.",
+    "about-readit": "About READ-IT",
+    "feedback-placeholder": "e.g. I love READ-IT!",
+    "feedback-failed": "Feedback submission failed. Please try again and if this error keeps occuring, contact the\n                site administrator.",
     "submit": "Submit",
-    "developed_by": "Developed by",
+    "developed-by": "Developed by",
     "add": "Add",
-    "define_category": "This is a",
+    "define-category": "This is a",
     "remove": "Remove",
     "filterHierarchy": {
         "mine": "by me",
@@ -27,118 +27,118 @@
         "semantic": "human",
         "nlp": "automated"
     },
-    "permitted_types_before_list": "This property permits",
-    "current_type": "Current type:",
+    "permitted-types-before-list": "This property permits",
+    "current-type": "Current type:",
     "typeHints": {
         "integer": "Include extra leading zeros to force interpretation as an integer type.",
         "base64Binary": "Include internal whitespace to force interpretation as base 64 binary data.",
         "gYear": "Include time zone information (such as a final &ldquo;Z&rdquo;) to force interpretation as a Gregorian year.",
         "string": "Start with a space to force interpretation as text or a derived string type."
     },
-    "all_types_permitted": "This property permits any simple type.",
-    "no_type_matched": "This value does not match the permitted type(s).",
+    "all-types-permitted": "This property permits any simple type.",
+    "no-type-matched": "This value does not match the permitted type(s).",
     "name": "Name",
     "value": "Value",
-    "item_metadata": "Item metadata",
+    "item-metadata": "Item metadata",
     "interpunction": {
         "colon": ":",
-        "paragraph_ellipsis": "(...)"
+        "paragraph-ellipsis": "(...)"
     },
     "sources": "Sources",
-    "sources_tally": "You uploaded {{userSources}} of {{totalSources}} sources.",
-    "view_sources": "View your sources",
-    "explore_sources": "Explore sources",
+    "sources-tally": "You uploaded {{userSources}} of {{totalSources}} sources.",
+    "view-sources": "View your sources",
+    "explore-sources": "Explore sources",
     "items": "Items",
-    "items_tally": "You created {{userItems}} of {{totalItems}} items.",
-    "view_items": "View your items",
-    "explore_items": "Explore items",
+    "items-tally": "You created {{userItems}} of {{totalItems}} items.",
+    "view-items": "View your items",
+    "explore-items": "Explore items",
     "username": "Username",
     "password": "Password",
-    "login_failed": "That didn't work. Please try again.",
+    "login-failed": "That didn't work. Please try again.",
     "login": "Login",
     "cancel": "Cancel",
-    "no_account": "Don't have an account?",
-    "sign_up": "Sign up!",
-    "main_navigation": "main navigation",
+    "no-account": "Don't have an account?",
+    "sign-up": "Sign up!",
+    "main-navigation": "main navigation",
     "menu": "menu",
-    "about_tooltip": "Find out more about the READ-IT project",
+    "about-tooltip": "Find out more about the READ-IT project",
     "about": "About",
-    "search_tooltip": "Search reading experiences and annotations",
+    "search-tooltip": "Search reading experiences and annotations",
     "search": "Search",
-    "explore_tooltip": "Get a random selection of reading experiences and annotations",
+    "explore-tooltip": "Get a random selection of reading experiences and annotations",
     "explore": "Explore",
-    "upload_tooltip": "Upload reading testimonies for annotation",
+    "upload-tooltip": "Upload reading testimonies for annotation",
     "upload": "Upload",
-    "contribute_tooltip": "Find out how to contribute to READ-IT",
+    "contribute-tooltip": "Find out how to contribute to READ-IT",
     "contribute": "Contribute",
     "greeting": "Bonjour {{username}}!",
     "landing-page": "Personal landing page",
     "feedback-tooltip": "Give us feedback on the interface",
-    "log_out": "Log out",
-    "not_found_alt": "404 Not Found",
-    "not_found_text": "Oops, this page doesn't seem to exist.\n    You can <a onclick=\"history.back()\">go back</a>,\n    visit <a href=\"/landing\">Landing</a> or <a href=\"/search\">Search</a>,\n    or report a problem to the maintainers.",
+    "log-out": "Log out",
+    "not-found-alt": "404 Not Found",
+    "not-found-text": "Oops, this page doesn't seem to exist.\n    You can <a onclick=\"history.back()\">go back</a>,\n    visit <a href=\"/landing\">Landing</a> or <a href=\"/search\">Search</a>,\n    or report a problem to the maintainers.",
     "pagination": "pagination",
-    "to_first_page": "Go to page 1",
-    "to_last_page": "Go to last page",
-    "annotations_title": "Annotations",
+    "to-first-page": "Go to page 1",
+    "to-last-page": "Go to last page",
+    "annotations-title": "Annotations",
     "filter": "Filter",
-    "export_annotations": "Export annotations",
-    "edit_annotation": "Edit Annotation",
-    "annotation_info": "(Find more info on what and how to annotate in\n            <a class=\"is-link\" href=\"http://dhstatic.hum.uu.nl/readit/AnnotationGuide.pdf\" target=\"_blank\"> the\n                Annotation Guide</a>",
-    "title_category": "Category",
-    "category_choice": "Choose a category before saving.",
-    "needs_verification": "Needs verification",
-    "label_choice": "Which one?",
-    "new_item_create": "Create new",
-    "edit_properties": "Edit properties",
-    "xsd_available_types_before_link": "See",
-    "xsd_available_types_link": "the XML Schema recommendation",
-    "xsd_available_types_after_link": "for an overview of the available types and their lexical representations.",
-    "preferred_label_choice": "Choose a preferred label before saving.",
+    "export-annotations": "Export annotations",
+    "edit-annotation": "Edit Annotation",
+    "annotation-info": "(Find more info on what and how to annotate in\n            <a class=\"is-link\" href=\"http://dhstatic.hum.uu.nl/readit/AnnotationGuide.pdf\" target=\"_blank\"> the\n                Annotation Guide</a>",
+    "title-category": "Category",
+    "category-choice": "Choose a category before saving.",
+    "needs-verification": "Needs verification",
+    "label-choice": "Which one?",
+    "new-item-create": "Create new",
+    "edit-properties": "Edit properties",
+    "xsd-available-types-before-link": "See",
+    "xsd-available-types-link": "the XML Schema recommendation",
+    "xsd-available-types-after-link": "for an overview of the available types and their lexical representations.",
+    "preferred-label-choice": "Choose a preferred label before saving.",
     "save": "Save",
     "delete": "Delete",
     "annotation": "Annotation",
-    "identified_as": "identified as",
+    "identified-as": "identified as",
     "item": "item",
-    "annotation_verification": "This annotation needs to be verified.",
-    "item_properties": "Item properties",
-    "related_items_title": "Related items",
-    "open_related": "Open related items",
-    "other_annotations_title": "Other annotations",
-    "open_annotations": "Open annotations",
-    "external_resources_title": "External resources",
-    "open_external": "Open external resources",
+    "annotation-verification": "This annotation needs to be verified.",
+    "item-properties": "Item properties",
+    "related-items-title": "Related items",
+    "open-related": "Open related items",
+    "other-annotations-title": "Other annotations",
+    "open-annotations": "Open annotations",
+    "external-resources-title": "External resources",
+    "open-external": "Open external resources",
     "edit": "Edit",
     "new": "New",
-    "annotation_metadata": "Annotation metadata",
-    "edit_external_resources": "Edit external resources",
-    "for_item": "For item",
-    "edit_related_items": "Edit related items",
-    "no_details": "No further details",
-    "search_results": "Search Results",
-    "source_title_many": "Sources",
-    "no_search_results": "No search results.",
-    "source_metadata_title": "Source metadata",
-    "properties_title": "Properties",
-    "delete_source": "Delete source",
-    "source_delete_confirm": "\nAre you sure you want to delete this source?\nIf you delete this source, all its annotation will be deleted as well, including any annotations that other users may have made.\nThis cannot be undone.\n",
-    "confirmation_complete": "Confirmation complete",
-    "sign_up_thanks_before_link": "Thank you for signing up. You can now",
-    "sign_up_thanks_link": "login",
-    "sign_up_thanks_after_link": ".",
-    "confirmation_failed": "Confirmation failed",
-    "token_expiration": "This is probably due to token expiration.",
-    "try_confirm_again": "Please try again and if this error keeps occuring, contact the site administrator.",
-    "registration_finished": "Registration finished succesfully!",
-    "activate_account": "Please activate your account via the link in the mail we just sent you.",
-    "find_email": "Make sure to check your 'Spam' folder if you can't find the email in your inbox.",
-    "close_window": "You can now close this window.",
+    "annotation-metadata": "Annotation metadata",
+    "edit-external-resources": "Edit external resources",
+    "for-item": "For item",
+    "edit-related-items": "Edit related items",
+    "no-details": "No further details",
+    "search-results": "Search Results",
+    "source-title-many": "Sources",
+    "no-search-results": "No search results.",
+    "source-metadata-title": "Source metadata",
+    "properties-title": "Properties",
+    "delete-source": "Delete source",
+    "source-delete-confirm": "\nAre you sure you want to delete this source?\nIf you delete this source, all its annotation will be deleted as well, including any annotations that other users may have made.\nThis cannot be undone.\n",
+    "confirmation-complete": "Confirmation complete",
+    "sign-up-thanks-before-link": "Thank you for signing up. You can now",
+    "sign-up-thanks-link": "login",
+    "sign-up-thanks-after-link": ".",
+    "confirmation-failed": "Confirmation failed",
+    "token-expiration": "This is probably due to token expiration.",
+    "try-confirm-again": "Please try again and if this error keeps occuring, contact the site administrator.",
+    "registration-finished": "Registration finished succesfully!",
+    "activate-account": "Please activate your account via the link in the mail we just sent you.",
+    "find-email": "Make sure to check your 'Spam' folder if you can't find the email in your inbox.",
+    "close-window": "You can now close this window.",
     "register": "Register",
     "email": "Email",
-    "repeat_password": "Repeat password",
-    "registration_failed": "Registration failed. Please try again and if this error keeps occuring, contact the site administrator.",
-    "view_operator_docs": "View documentation of search operators",
-    "search_database": "Search our database",
+    "repeat-password": "Repeat password",
+    "registration-failed": "Registration failed. Please try again and if this error keeps occuring, contact the site administrator.",
+    "view-operator-docs": "View documentation of search operators",
+    "search-database": "Search our database",
     "filters": {
         "and": "AND",
         "or": "OR",
@@ -157,11 +157,11 @@
         "groupPredicates": "traverse predicate"
     },
     "semsearch-subtitle": "Find linked data items based on semantic features",
-    "optional_label_placeholder": "optional label for reference",
+    "optional-label-placeholder": "optional label for reference",
     "semsearch-submit": "Search",
-    "show_hide_metadata": "Show / hide the source metadata",
-    "show_hide_annotations": "Show / hide annotations",
-    "upload_source": "Upload source",
+    "show-hide-metadata": "Show / hide the source metadata",
+    "show-hide-annotations": "Show / hide annotations",
+    "upload-source": "Upload source",
     "title": "Title",
     "author": "Author",
     "editor": "Editor (optional)",
diff --git a/frontend/src/item-edit/allowed-type-list-template.hbs b/frontend/src/item-edit/allowed-type-list-template.hbs
index 9ecbdeec..b60c8a84 100644
--- a/frontend/src/item-edit/allowed-type-list-template.hbs
+++ b/frontend/src/item-edit/allowed-type-list-template.hbs
@@ -1,8 +1,8 @@
 <span>
-    {{#i18n 'permitted_types_before_list'}}
+    {{#i18n 'permitted-types-before-list'}}
     This property permits
     {{/i18n}}
 </span><span class="rit-type-list">
-</span><span>{{#i18n 'permitted_types_after_list'
+</span><span>{{#i18n 'permitted-types-after-list'
 }}.{{/i18n
 }}</span>
diff --git a/frontend/src/item-edit/detected-type-help-template.hbs b/frontend/src/item-edit/detected-type-help-template.hbs
index 08468003..9599c1ea 100644
--- a/frontend/src/item-edit/detected-type-help-template.hbs
+++ b/frontend/src/item-edit/detected-type-help-template.hbs
@@ -1,4 +1,4 @@
-{{#i18n 'current_type'}}Current type:{{/i18n}}
+{{#i18n 'current-type'}}Current type:{{/i18n}}
 <span>{{! ScopedIriHyperlink will go here}}</span>.
 {{#typeHints}}
 {{.}}
diff --git a/frontend/src/item-edit/linked-item-editor-template.hbs b/frontend/src/item-edit/linked-item-editor-template.hbs
index c462f678..a90d9c35 100644
--- a/frontend/src/item-edit/linked-item-editor-template.hbs
+++ b/frontend/src/item-edit/linked-item-editor-template.hbs
@@ -9,12 +9,12 @@
     </div>
 </div>
 <p class="help">
-    {{#i18n 'all_types_permitted'}}
+    {{#i18n 'all-types-permitted'}}
     This property permits any simple type.
     {{/i18n}}
 </p>
 <p class="help is-danger">
-    {{#i18n 'no_type_matched'}}
+    {{#i18n 'no-type-matched'}}
     This value does not match the permitted type(s).
     {{/i18n}}
 </p>
diff --git a/frontend/src/item-metadata/item-metadata-view.ts b/frontend/src/item-metadata/item-metadata-view.ts
index c9a392d5..e7a4f03f 100644
--- a/frontend/src/item-metadata/item-metadata-view.ts
+++ b/frontend/src/item-metadata/item-metadata-view.ts
@@ -29,7 +29,7 @@ export default class ItemMetadataView extends View<Node> {
     }
 
     initialize(options: ViewOptions): void {
-        this.title = options.title || i18next.t('item_metadata', 'Item metadata');
+        this.title = options.title || i18next.t('item-metadata', 'Item metadata');
         this.render().listenTo(this.model, 'change', this.render);
     }
 
diff --git a/frontend/src/landing/landing-template.hbs b/frontend/src/landing/landing-template.hbs
index 4c6d8ede..bbfab272 100644
--- a/frontend/src/landing/landing-template.hbs
+++ b/frontend/src/landing/landing-template.hbs
@@ -5,23 +5,23 @@
     <div class="card sources">
         <div class="card-content">
             <p class="title">{{#i18n 'sources'}}Sources{{/i18n}}</p>
-            <p class="subtitle">{{#i18n 'sources_tally'}}You uploaded {{userSources}} of {{totalSources}} sources.{{/i18n}}</p>
+            <p class="subtitle">{{#i18n 'sources-tally'}}You uploaded {{userSources}} of {{totalSources}} sources.{{/i18n}}</p>
         </div>
         <div class="card-footer">
-            <a href="explore/sources/mine" class="card-footer-item user-sources">{{#i18n 'view_sources'}}View your sources{{/i18n}}</a>
-            <a href="explore/sources" class="card-footer-item user-sources">{{#i18n 'explore_sources'}}Explore sources{{/i18n}}</a>
+            <a href="explore/sources/mine" class="card-footer-item user-sources">{{#i18n 'view-sources'}}View your sources{{/i18n}}</a>
+            <a href="explore/sources" class="card-footer-item user-sources">{{#i18n 'explore-sources'}}Explore sources{{/i18n}}</a>
         </div>
     </div>
     <div class="card items">
         <div class="card-content">
             <p class="title">{{#i18n 'items'}}Items{{/i18n}}</p>
             <p class="subtitle">
-                {{#i18n 'items_tally'}}You created {{userItems}} of {{totalItems}} items.{{/i18n}}
+                {{#i18n 'items-tally'}}You created {{userItems}} of {{totalItems}} items.{{/i18n}}
             </p>
         </div>
         <div class="card-footer">
-            <a href="explore/items/mine" class="card-footer-item user-items">{{#i18n 'view_items'}}View your items{{/i18n}}</a>
-            <a href="explore/items" class="card-footer-item user-items">{{#i18n 'explore_items'}}Explore items{{/i18n}}</a>
+            <a href="explore/items/mine" class="card-footer-item user-items">{{#i18n 'view-items'}}View your items{{/i18n}}</a>
+            <a href="explore/items" class="card-footer-item user-items">{{#i18n 'explore-items'}}Explore items{{/i18n}}</a>
         </div>
     </div>
 </div>
diff --git a/frontend/src/login/login-template.hbs b/frontend/src/login/login-template.hbs
index d5733414..64dfb682 100644
--- a/frontend/src/login/login-template.hbs
+++ b/frontend/src/login/login-template.hbs
@@ -12,7 +12,7 @@
             <div class="control">
                 <input type=password name=password required class="input">
             </div>
-            <p class="help is-danger login-failed is-hidden">{{#i18n 'login_failed'}}That didn't work. Please try again.{{/i18n}}</p>
+            <p class="help is-danger login-failed is-hidden">{{#i18n 'login-failed'}}That didn't work. Please try again.{{/i18n}}</p>
         </div>
         <div class="field is-grouped">
             <div class="control">
@@ -22,7 +22,7 @@
                 <button type=reset class="button">{{#i18n 'cancel'}}Cancel{{/i18n}}</button>
             </div>
             <div class="control is-vertical-center">
-                <p>{{#i18n 'no_account'}}Don't have an account?{{/i18n}}<a id="register">{{#i18n 'sign_up'}}Sign up!{{/i18n}}</a></p>
+                <p>{{#i18n 'no-account'}}Don't have an account?{{/i18n}}<a id="register">{{#i18n 'sign-up'}}Sign up!{{/i18n}}</a></p>
             </div>
         </div>
     </form>
diff --git a/frontend/src/menu/menu-template.hbs b/frontend/src/menu/menu-template.hbs
index b71770db..483571b1 100644
--- a/frontend/src/menu/menu-template.hbs
+++ b/frontend/src/menu/menu-template.hbs
@@ -1,7 +1,7 @@
 <nav
     class="navbar"
     role="navigation"
-    aria-label="{{#i18n 'main_navigation'}}main navigation{{/i18n}}"
+    aria-label="{{#i18n 'main-navigation'}}main navigation{{/i18n}}"
 >
     <div class="container">
         <div class="navbar-brand">
@@ -22,14 +22,14 @@
         </div>
         <div id="navbarMenu" class="navbar-menu">
             <div class="navbar-start">
-                <a class="navbar-item tooltip is-tooltip-right" data-tooltip="{{#i18n 'about_tooltip'}}Find out more about the READ-IT project{{/i18n}}" href="https://readit-project.eu" target="_blank">
+                <a class="navbar-item tooltip is-tooltip-right" data-tooltip="{{#i18n 'about-tooltip'}}Find out more about the READ-IT project{{/i18n}}" href="https://readit-project.eu" target="_blank">
                     <span class="icon-text">
                         <span class="icon is-small has-text-primary">
                             <i class="fas fa-info-circle"></i>
                         </span>
                         <span>{{#i18n 'about'}}About{{/i18n}}</span>
                 </a>
-                <a class="navbar-item tooltip is-tooltip-left" data-tooltip="{{#i18n 'search_tooltip'}}Search reading experiences and annotations{{/i18n}}" href="/search">
+                <a class="navbar-item tooltip is-tooltip-left" data-tooltip="{{#i18n 'search-tooltip'}}Search reading experiences and annotations{{/i18n}}" href="/search">
                     <span class="icon-text">
                         <span class="icon is-small has-text-primary">
                             <i class="fas fa-search"></i>
@@ -37,7 +37,7 @@
                         <span>{{#i18n 'search'}}Search{{/i18n}}</span>
                     </span>
                 </a>
-                <div class="navbar-item has-dropdown is-hoverable" data-tooltip="{{#i18n 'explore_tooltip'}}Get a random selection of reading experiences and annotations{{/i18n}}">
+                <div class="navbar-item has-dropdown is-hoverable" data-tooltip="{{#i18n 'explore-tooltip'}}Get a random selection of reading experiences and annotations{{/i18n}}">
                     <a class="navbar-link">
                         <span class="icon-text">
                             <span class="icon is-small has-text-primary">
@@ -57,7 +57,7 @@
                 </div>
                 {{#if uploadSources}}
                 <a class="navbar-item tooltip is-tooltip-left"
-                    data-tooltip="{{#i18n 'upload_tooltip'}}Upload reading testimonies for annotation{{/i18n}}" href="/upload">
+                    data-tooltip="{{#i18n 'upload-tooltip'}}Upload reading testimonies for annotation{{/i18n}}" href="/upload">
                     <span class="icon-text">
                         <span class="icon is-small has-text-primary">
                             <i class="fas fa-upload"></i>
@@ -68,7 +68,7 @@
                 {{/if}}
             </div>
             <div class="navbar-end">
-                <a class="navbar-item tooltip is-tooltip-left" data-tooltip="{{#i18n 'contribute_tooltip'}}Find out how to contribute to READ-IT{{/i18n}}"
+                <a class="navbar-item tooltip is-tooltip-left" data-tooltip="{{#i18n 'contribute-tooltip'}}Find out how to contribute to READ-IT{{/i18n}}"
                     href="https://readit-project.eu/contact/contribute-to-read-it/", target="_blank">
                     <span class="icon-text">
                         <span>{{#i18n 'contribute'}}Contribute{{/i18n}} </span>
@@ -87,17 +87,17 @@
                             {{#i18n 'landing-page'}}Personal landing page{{/i18n}}
                         </a>
                         <a class="navbar-item" href="/explore/sources/mine">
-                            {{#i18n 'my_sources'}}My sources{{/i18n}}
+                            {{#i18n 'my-sources'}}My sources{{/i18n}}
                         </a>
                         <a class="navbar-item" href="/explore/items/mine">
-                            {{#i18n 'my_items'}}My items{{/i18n}}
+                            {{#i18n 'my-items'}}My items{{/i18n}}
                         </a>
                         <hr class="navbar-divider">
                         <a class="navbar-item tooltip is-tooltip-left" data-tooltip="{{#i18n 'feedback-tooltip'}}Give us feedback on the interface{{/i18n}}" id="feedback">
                             {{#i18n 'feedback'}}Feedback{{/i18n}}
                         </a>
                         <a class="navbar-item" id="logout" href="/leave">
-                            {{#i18n 'log_out'}}Log out{{/i18n}}
+                            {{#i18n 'log-out'}}Log out{{/i18n}}
                         </a>
                     </div>
                 </div>
diff --git a/frontend/src/notfound404/notfound-template.hbs b/frontend/src/notfound404/notfound-template.hbs
index d45a032f..5f5556a6 100644
--- a/frontend/src/notfound404/notfound-template.hbs
+++ b/frontend/src/notfound404/notfound-template.hbs
@@ -1,10 +1,10 @@
 <figure class="image notfound">
     <img
         src="{{static 'image/404.svg'}}"
-        alt="{{#i18n 'not_found_alt'}}404 Not Found{{/i18n}}"
+        alt="{{#i18n 'not-found-alt'}}404 Not Found{{/i18n}}"
     >
 </figure>
-<p>{{#i18n 'not_found_text'}}
+<p>{{#i18n 'not-found-text'}}
     Oops, this page doesn't seem to exist.
     You can <a onclick="history.back()">go back</a>,
     visit <a href="/landing">Landing</a> or <a href="/search">Search</a>,
diff --git a/frontend/src/pagination/pagination-template.hbs b/frontend/src/pagination/pagination-template.hbs
index e2590606..aedfdf3b 100644
--- a/frontend/src/pagination/pagination-template.hbs
+++ b/frontend/src/pagination/pagination-template.hbs
@@ -15,7 +15,7 @@
             <a
                 id="page-first"
                 class="pagination-link"
-                aria-label="{{#i18n 'to_first_page'}}Go to page 1{{/i18n}}"
+                aria-label="{{#i18n 'to-first-page'}}Go to page 1{{/i18n}}"
             >1</a>
         </li>
         {{/if}}
@@ -45,7 +45,7 @@
             <a
                 id="page-last"
                 class="pagination-link"
-                aria-label="{{#i18n 'to_last_page'}}Go to last page{{/i18n}}"
+                aria-label="{{#i18n 'to-last-page'}}Go to last page{{/i18n}}"
             >{{totalPages}}</a>
         </li>
         {{/if}}
diff --git a/frontend/src/panel-annotation-list/annotation-list-panel-template.hbs b/frontend/src/panel-annotation-list/annotation-list-panel-template.hbs
index 9639ccf3..8808766a 100644
--- a/frontend/src/panel-annotation-list/annotation-list-panel-template.hbs
+++ b/frontend/src/panel-annotation-list/annotation-list-panel-template.hbs
@@ -1,6 +1,6 @@
 <div class="panel-header">
     <header>
-        <h3 class="title is-3">{{#i18n 'annotations_title'}}Annotations{{/i18n}}</h3>
+        <h3 class="title is-3">{{#i18n 'annotations-title'}}Annotations{{/i18n}}</h3>
     </header>
     <div class="buttons is-right">
         <button type=button class="button filter">
@@ -11,7 +11,7 @@
         </button>
         <a class="button rdf-export" href="{{downloadLink}}">
             <span class="icon is-large has-text-primary tooltip is-tooltip-left"
-                data-tooltip="{{#i18n 'export_annotations'}}Export annotations{{/i18n}}">
+                data-tooltip="{{#i18n 'export-annotations'}}Export annotations{{/i18n}}">
                 <i class="fas fa-download"></i>
             </span>
         </a>
diff --git a/frontend/src/panel-annotation/annotation-edit-template.hbs b/frontend/src/panel-annotation/annotation-edit-template.hbs
index b053b52e..ca21f1cd 100644
--- a/frontend/src/panel-annotation/annotation-edit-template.hbs
+++ b/frontend/src/panel-annotation/annotation-edit-template.hbs
@@ -1,7 +1,7 @@
 <div class="panel-header">
     <header>
-        <p class="title is-3">{{#i18n 'edit_annotation'}}Edit Annotation{{/i18n}}</p>
-        <p class="subtitle is-7">{{#i18n 'annotation_info'}}(Find more info on what and how to annotate in
+        <p class="title is-3">{{#i18n 'edit-annotation'}}Edit Annotation{{/i18n}}</p>
+        <p class="subtitle is-7">{{#i18n 'annotation-info'}}(Find more info on what and how to annotate in
             <a class="is-link" href="http://dhstatic.hum.uu.nl/readit/AnnotationGuide.pdf" target="_blank"> the
                 Annotation Guide</a>{{/i18n}})
         </p>
@@ -15,19 +15,19 @@
 
         <fieldset class="field">
             <div class="field">
-                <label for="category-{{cid}}" class="label">{{#i18n 'title_category'}}Category{{/i18n}}</label>
+                <label for="category-{{cid}}" class="label">{{#i18n 'title-category'}}Category{{/i18n}}</label>
                 <div class="control ontology-class-picker-container">
                     {{! Ontology class picker is inserted here }}
                 </div>
                 {{! Fake input to utilize jquery validation on Bulma dropdown}}
                 <input class="hidden-input" type="text" id="{{cid}}-contology" required>
-                <p class="help is-danger class-unset is-hidden">{{#i18n 'category_choice'}}Choose a category before saving.{{/i18n}}</p>
+                <p class="help is-danger class-unset is-hidden">{{#i18n 'category-choice'}}Choose a category before saving.{{/i18n}}</p>
             </div>
             <div class="field">
                 <div class="control">
                     <label class="checkbox">
                         <input type="checkbox" class="verification-checkbox" {{#if needsVerification}} checked{{/if}}>
-                        {{#i18n 'needs_verification'}}Needs verification{{/i18n}}
+                        {{#i18n 'needs-verification'}}Needs verification{{/i18n}}
                     </label>
                 </div>
             </div>
@@ -35,14 +35,14 @@
 
         <fieldset class="item-picker-container is-hidden field">
             <div class="field">
-                <label class="label">{{#i18n 'label_choice'}}Which one?{{/i18n}}</label>
+                <label class="label">{{#i18n 'label-choice'}}Which one?{{/i18n}}</label>
                 <div class="field has-addons">
                     <div class="control">
                         {{! Item picker will be inserted here }}
                     </div>
                     <div class="control">
                         <button type=button class="button create-item-button is-primary" id="{{cid}}-create-item">
-                            {{#i18n 'new_item_create'}}Create new{{/i18n}}
+                            {{#i18n 'new-item-create'}}Create new{{/i18n}}
                         </button>
                     </div>
                 </div>
@@ -50,22 +50,22 @@
         </fieldset>
         <fieldset class="item-edit-container is-hidden">
             <div class="field">
-                <label class="label">{{#i18n 'edit_properties'}}Edit properties{{/i18n}}</label>
+                <label class="label">{{#i18n 'edit-properties'}}Edit properties{{/i18n}}</label>
                 <p class="help">
-                    {{#i18n 'xsd_available_types_before_link'}}See{{/i18n}}
+                    {{#i18n 'xsd-available-types-before-link'}}See{{/i18n}}
                     <a href="https://www.w3.org/TR/2004/REC-xmlschema-2-20041028/#built-in-datatypes" target=_blank>
-                        {{#i18n 'xsd_available_types_link'}}
+                        {{#i18n 'xsd-available-types-link'}}
                         the XML Schema recommendation
                         {{/i18n}}
                     </a>
-                    {{#i18n 'xsd_available_types_after_link'}}
+                    {{#i18n 'xsd-available-types-after-link'}}
                     for an overview of the available types and their lexical representations.
                     {{/i18n}}
                 </p>
                 <div class="item-multifield">
                 {{! Item multifield will be inserted here }}
                 </div>
-                <p class="help is-danger label-unset is-hidden">{{#i18n 'preferred_label_choice'}}Choose a preferred label before saving.{{/i18n}}</p>
+                <p class="help is-danger label-unset is-hidden">{{#i18n 'preferred-label-choice'}}Choose a preferred label before saving.{{/i18n}}</p>
                 </div>
         </fieldset>
 
diff --git a/frontend/src/panel-annotation/annotation-template.hbs b/frontend/src/panel-annotation/annotation-template.hbs
index 8aa2f914..cc356d1f 100644
--- a/frontend/src/panel-annotation/annotation-template.hbs
+++ b/frontend/src/panel-annotation/annotation-template.hbs
@@ -4,13 +4,13 @@
         <h3 class="title is-3">{{label}}</h3>
         <h6 class="subtitle is-6">{{#if annotationSerial }}
             {{#i18n 'annotation'}}Annotation{{/i18n}} {{ annotationSerial }}{{#if itemSerial}},
-            {{#i18n 'identified_as'}}identified as{{/i18n}}
+            {{#i18n 'identified-as'}}identified as{{/i18n}}
             {{/if}}{{/if}}{{#if itemSerial }}
             {{#i18n 'item'}}item{{/i18n}}/{{ itemSerial }}
         {{/if}}</h6>
         {{#if needsVerification}}
         <h6 class="title is-6">
-            {{#i18n 'annotation_verification'}}This annotation needs to be verified.{{/i18n}}
+            {{#i18n 'annotation-verification'}}This annotation needs to be verified.{{/i18n}}
         </h6>{{/if}}
     </header>
 </div>
@@ -20,7 +20,7 @@
     <section class="item-sections">
         <article class="item-section">
             <div class="item-section-header">
-                <p>{{#i18n 'item_properties'}}Item properties{{/i18n}}</p>
+                <p>{{#i18n 'item-properties'}}Item properties{{/i18n}}</p>
             </div>
             <table class="table is-bordered">
                 <thead>
@@ -48,10 +48,10 @@
     <section class="item-sections">
         <article class="item-section has-mt-10">
             <div class="item-section-header" id="btnRelItems">
-                <p>{{#i18n 'related_items_title'}}Related items{{/i18n}}</p>
+                <p>{{#i18n 'related-items-title'}}Related items{{/i18n}}</p>
                 <span
                     class="icon is-large has-text-primary tooltip is-tooltip-left"
-                    data-tooltip="{{#i18n 'open_related'}}Open related items{{/i18n}}"
+                    data-tooltip="{{#i18n 'open-related'}}Open related items{{/i18n}}"
                 >
                     <i class="fas fa-arrow-circle-right"></i>
                 </span>
@@ -60,13 +60,13 @@
         <article class="item-section has-mt-10">
             <div class="item-section-header" id="btnAnnotations">
                 <p>{{#if annotationSerial }}
-                    {{#i18n 'other_annotations_title'}}Other annotations{{/i18n}}
+                    {{#i18n 'other-annotations-title'}}Other annotations{{/i18n}}
                     {{else}}
-                    {{#i18n 'annotations_title'}}Annotations{{/i18n}}
+                    {{#i18n 'annotations-title'}}Annotations{{/i18n}}
                 {{/if}}</p>
                 <span
                     class="icon is-large has-text-primary tooltip is-tooltip-left"
-                    data-tooltip="{{#i18n 'open_annotations'}}Open annotations{{/i18n}}"
+                    data-tooltip="{{#i18n 'open-annotations'}}Open annotations{{/i18n}}"
                 >
                     <i class="fas fa-arrow-circle-right"></i>
                 </span>
@@ -74,10 +74,10 @@
         </article>
         <article class="item-section has-mt-10">
             <div class="item-section-header" id="btnExtResources">
-                <p>{{#i18n 'external_resources_title'}}External resources{{/i18n}}</p>
+                <p>{{#i18n 'external-resources-title'}}External resources{{/i18n}}</p>
                 <span
                     class="icon is-large has-text-primary tooltip is-tooltip-left"
-                    data-tooltip="{{#i18n 'open_external'}}Open external resources{{/i18n}}"
+                    data-tooltip="{{#i18n 'open-external'}}Open external resources{{/i18n}}"
                 >
                     <i class="fas fa-arrow-circle-right"></i>
                 </span>
diff --git a/frontend/src/panel-annotation/annotation-view.ts b/frontend/src/panel-annotation/annotation-view.ts
index 9e1e1cda..b3e886ef 100644
--- a/frontend/src/panel-annotation/annotation-view.ts
+++ b/frontend/src/panel-annotation/annotation-view.ts
@@ -50,7 +50,7 @@ export default class AnnotationView extends CompositeView<FlatItem> {
         if (annotation) {
             this.annotationMetadataView = new ItemMetadataView({
                 model: annotation,
-                title: i18next.t('annotation_metadata', 'Annotation metadata')
+                title: i18next.t('annotation-metadata', 'Annotation metadata')
             });
         }
     }
diff --git a/frontend/src/panel-external-resources/external-resources-edit-view.ts b/frontend/src/panel-external-resources/external-resources-edit-view.ts
index 72e7631f..c7d0c966 100644
--- a/frontend/src/panel-external-resources/external-resources-edit-view.ts
+++ b/frontend/src/panel-external-resources/external-resources-edit-view.ts
@@ -26,5 +26,5 @@ export default class ExternalResourcesEditView extends FieldEditingPanel {
 }
 
 extend(ExternalResourcesEditView.prototype, {
-    title: i18next.t('edit_external_resources', 'Edit external resources'),
+    title: i18next.t('edit-external-resources', 'Edit external resources'),
 });
diff --git a/frontend/src/panel-external-resources/external-resources-template.hbs b/frontend/src/panel-external-resources/external-resources-template.hbs
index f7ba5c8f..54e054a5 100644
--- a/frontend/src/panel-external-resources/external-resources-template.hbs
+++ b/frontend/src/panel-external-resources/external-resources-template.hbs
@@ -1,7 +1,7 @@
 <div class="panel-header">
     <header>
-        <h3 class="title is-3">{{#i18n 'external_resources_title'}}External resources{{/i18n}}</h3>
-        <h6 class="subtitle is-6">{{#i18n 'for_item'}}For item{{/i18n}}/{{ itemSerial }}</h6>
+        <h3 class="title is-3">{{#i18n 'external-resources-title'}}External resources{{/i18n}}</h3>
+        <h6 class="subtitle is-6">{{#i18n 'for-item'}}For item{{/i18n}}/{{ itemSerial }}</h6>
     </header>
 </div>
 <div class="panel-content external">
diff --git a/frontend/src/panel-related-items/related-items-edit-view.ts b/frontend/src/panel-related-items/related-items-edit-view.ts
index e691a3a7..9472ed9c 100644
--- a/frontend/src/panel-related-items/related-items-edit-view.ts
+++ b/frontend/src/panel-related-items/related-items-edit-view.ts
@@ -26,5 +26,5 @@ export default class RelatedItemsEditor extends FieldEditingPanel {
 }
 
 extend(RelatedItemsEditor.prototype, {
-    title: i18next.t('edit_related_items', 'Edit related items'),
+    title: i18next.t('edit-related-items', 'Edit related items'),
 });
diff --git a/frontend/src/panel-related-items/related-items-template.hbs b/frontend/src/panel-related-items/related-items-template.hbs
index 89fa53af..66b808fb 100644
--- a/frontend/src/panel-related-items/related-items-template.hbs
+++ b/frontend/src/panel-related-items/related-items-template.hbs
@@ -1,7 +1,7 @@
 <div class="panel-header">
     <header>
-        <h3 class="title is-3">{{#i18n 'related_items_title'}}Related items{{/i18n}}</h3>
-        <h6 class="subtitle is-6">{{#i18n 'for_item'}}For item{{/i18n}}/{{ itemSerial }}</h6>
+        <h3 class="title is-3">{{#i18n 'related-items-title'}}Related items{{/i18n}}</h3>
+        <h6 class="subtitle is-6">{{#i18n 'for-item'}}For item{{/i18n}}/{{ itemSerial }}</h6>
     </header>
 </div>
 <div class="panel-content relations"></div>
diff --git a/frontend/src/panel-search-results/search-result-item-template.hbs b/frontend/src/panel-search-results/search-result-item-template.hbs
index 82412268..abb86df4 100644
--- a/frontend/src/panel-search-results/search-result-item-template.hbs
+++ b/frontend/src/panel-search-results/search-result-item-template.hbs
@@ -5,7 +5,7 @@
 <h5 class="title is-5">{{model.attributes.label}}</h5>
 
 {{#unless properties}}
-<i>{{#i18n 'no_details'}}No further details{{/i18n}}</i>
+<i>{{#i18n 'no-details'}}No further details{{/i18n}}</i>
 {{/unless}}
 {{#each properties}}
 <p>
diff --git a/frontend/src/panel-search-results/search-result-list-panel.ts b/frontend/src/panel-search-results/search-result-list-panel.ts
index cf141090..411c5567 100644
--- a/frontend/src/panel-search-results/search-result-list-panel.ts
+++ b/frontend/src/panel-search-results/search-result-list-panel.ts
@@ -48,7 +48,7 @@ export default class SearchResultListPanel extends CompositeView {
     }
 
     initialize(options: ViewOptions): this {
-        this.title = options.title || i18next.t('search_results', 'Search Results');
+        this.title = options.title || i18next.t('search-results', 'Search Results');
         this.searchList = new SearchResultListView(options).render();
         this.listenTo(this.collection, {
             focus: this.onFocus,
diff --git a/frontend/src/panel-source-list/source-list-panel-template.hbs b/frontend/src/panel-source-list/source-list-panel-template.hbs
index a2f039e9..582c1f3d 100644
--- a/frontend/src/panel-source-list/source-list-panel-template.hbs
+++ b/frontend/src/panel-source-list/source-list-panel-template.hbs
@@ -1,6 +1,6 @@
 <div class="panel-header">
     <header>
-        <h3 class="title is-4">{{#i18n 'source_title_many'}}Sources{{/i18n}}</h3>
+        <h3 class="title is-4">{{#i18n 'source-title-many'}}Sources{{/i18n}}</h3>
     </header>
 </div>
 <div class="panel-content">
diff --git a/frontend/src/panel-source-list/source-list-template.hbs b/frontend/src/panel-source-list/source-list-template.hbs
index 56e0f0b2..a8a33e6a 100644
--- a/frontend/src/panel-source-list/source-list-template.hbs
+++ b/frontend/src/panel-source-list/source-list-template.hbs
@@ -1,4 +1,4 @@
 {{#if noResults}}
-<p class="title is-5">{{#i18n 'no_search_results'}}No search results.{{/i18n}}</p>
+<p class="title is-5">{{#i18n 'no-search-results'}}No search results.{{/i18n}}</p>
 {{/if}}
 <div class="source-summary"></div>
\ No newline at end of file
diff --git a/frontend/src/panel-source/source-metadata-template.hbs b/frontend/src/panel-source/source-metadata-template.hbs
index 5a04a64b..04171371 100644
--- a/frontend/src/panel-source/source-metadata-template.hbs
+++ b/frontend/src/panel-source/source-metadata-template.hbs
@@ -1,14 +1,14 @@
 <div class="panel-header">
     <button type=button class="button btn-close"><i class="fas fa-times"></i></button>
     <header>
-        <h1 class="title is-3">{{#i18n 'source_metadata_title'}}Source metadata{{/i18n}}</h3>
+        <h1 class="title is-3">{{#i18n 'source-metadata-title'}}Source metadata{{/i18n}}</h3>
     </header>
 </div>
 <div class="panel-content">
     <section class="item-sections">
         <article class="item-section">
             <div class="item-section-header">
-                <p>{{#i18n 'properties_title'}}Properties{{/i18n}}</p>
+                <p>{{#i18n 'properties-title'}}Properties{{/i18n}}</p>
             </div>
             <table class="table is-bordered">
                 <thead>
@@ -31,7 +31,7 @@
 
 </div>
 <div class="panel-footer buttons is-right">{{#userIsOwner}}
-    <button type=button class="button btn-delete is-danger">{{#i18n 'delete_source'}}Delete source{{/i18n}}</button>
+    <button type=button class="button btn-delete is-danger">{{#i18n 'delete-source'}}Delete source{{/i18n}}</button>
     <button type=reset class="button btn-cancel">{{#i18n 'cancel'}}Cancel{{/i18n}}</button>
     <button type=button class="button btn-edit">{{#i18n 'edit'}}Edit{{/i18n}}</button>
 {{/userIsOwner}}</div>
diff --git a/frontend/src/panel-source/source-metadata-view.ts b/frontend/src/panel-source/source-metadata-view.ts
index b78b704d..0ed83f35 100644
--- a/frontend/src/panel-source/source-metadata-view.ts
+++ b/frontend/src/panel-source/source-metadata-view.ts
@@ -18,7 +18,7 @@ const excludedProperties = [
     'owl:sameAs'
 ];
 
-const sourceDeletionDialog = i18next.t('source_delete_confirm', `
+const sourceDeletionDialog = i18next.t('source-delete-confirm', `
 Are you sure you want to delete this source?
 If you delete this source, all its annotation will be deleted as well, including any annotations that other users may have made.
 This cannot be undone.
diff --git a/frontend/src/registration/confirm-registration-template.hbs b/frontend/src/registration/confirm-registration-template.hbs
index 68c1eeb2..2c5228e8 100644
--- a/frontend/src/registration/confirm-registration-template.hbs
+++ b/frontend/src/registration/confirm-registration-template.hbs
@@ -2,19 +2,19 @@
 <div class="modal-content">
     <form class="box is-narrow-modal-form">
     {{#if isConfirmed}}
-    <h3 class="title is-3">{{#i18n 'confirmation_complete'}}Confirmation complete{{/i18n}}</h3>
-    <p>{{#i18n 'sign_up_thanks_before_link'}}Thank you for signing up. You can now {{/i18n}}<a href='search'>{{#i18n 'sign_up_thanks_link'}}login{{/i18n}}</a>{{#i18n 'sign_up_thanks_after_link'}}.{{/i18n}}</p>
+    <h3 class="title is-3">{{#i18n 'confirmation-complete'}}Confirmation complete{{/i18n}}</h3>
+    <p>{{#i18n 'sign-up-thanks-before-link'}}Thank you for signing up. You can now {{/i18n}}<a href='search'>{{#i18n 'sign-up-thanks-link'}}login{{/i18n}}</a>{{#i18n 'sign-up-thanks-after-link'}}.{{/i18n}}</p>
     {{/if}}
 
     {{#if wasNotFound}}
-    <h3 class="title is-3">{{#i18n 'confirmation_failed'}}Confirmation failed{{/i18n}}</h3>
-    <p>{{#i18n 'token_expiration'}}This is probably due to token expiration.{{/i18n}}</p>
-    <p>{{#i18n 'try_confirm_again'}}Please try again and if this error keeps occuring, contact the site administrator.{{/i18n}}</p>
+    <h3 class="title is-3">{{#i18n 'confirmation-failed'}}Confirmation failed{{/i18n}}</h3>
+    <p>{{#i18n 'token-expiration'}}This is probably due to token expiration.{{/i18n}}</p>
+    <p>{{#i18n 'try-confirm-again'}}Please try again and if this error keeps occuring, contact the site administrator.{{/i18n}}</p>
     {{/if}}
 
     {{#if hasError}}
-    <h3 class="title is-3">{{#i18n 'confirmation_failed'}}Confirmation failed{{/i18n}}</h3>
-    <p>{{#i18n 'try_confirm_again'}}Please try again and if this error keeps occuring, contact the site administrator.{{/i18n}}</p>
+    <h3 class="title is-3">{{#i18n 'confirmation-failed'}}Confirmation failed{{/i18n}}</h3>
+    <p>{{#i18n 'try-confirm-again'}}Please try again and if this error keeps occuring, contact the site administrator.{{/i18n}}</p>
     {{/if}}
     </form>
 </div>
diff --git a/frontend/src/registration/registration-template.hbs b/frontend/src/registration/registration-template.hbs
index 00982a82..90dac99c 100644
--- a/frontend/src/registration/registration-template.hbs
+++ b/frontend/src/registration/registration-template.hbs
@@ -3,11 +3,11 @@
     <form class="box register-form is-narrow-modal-form">
         {{#if isSuccess}}
         <header>
-            <h3 class="title is-3 page-header">{{#i18n 'registration_finished'}}Registration finished succesfully!{{/i18n}}</h3>
+            <h3 class="title is-3 page-header">{{#i18n 'registration-finished'}}Registration finished succesfully!{{/i18n}}</h3>
         </header>
-        <p>{{#i18n 'activate_account'}}Please activate your account via the link in the mail we just sent you.{{/i18n}}</p>
-        <p>{{#i18n 'find_email'}}Make sure to check your 'Spam' folder if you can't find the email in your inbox.{{/i18n}}</p>
-        <p>{{#i18n 'close_window'}}You can now close this window.{{/i18n}}</p>
+        <p>{{#i18n 'activate-account'}}Please activate your account via the link in the mail we just sent you.{{/i18n}}</p>
+        <p>{{#i18n 'find-email'}}Make sure to check your 'Spam' folder if you can't find the email in your inbox.{{/i18n}}</p>
+        <p>{{#i18n 'close-window'}}You can now close this window.{{/i18n}}</p>
         {{else}}
         <header>
             <h3 class="title is-3 page-header">{{#i18n 'register'}}Register{{/i18n}}</h3>
@@ -52,14 +52,14 @@
                     name="password2"
                     class="input"
                     type="password"
-                    placeholder="{{#i18n 'repeat_password'}}Repeat password{{/i18n}}"
+                    placeholder="{{#i18n 'repeat-password'}}Repeat password{{/i18n}}"
                 >
             </div>
         </div>
 
         {{#if hasError}}
         <div class="field form-feedback-bar has-background-danger has-text-white">
-            <p class="help">{{#i18n 'registration_failed'}}Registration failed. Please try again and if this error keeps occuring, contact the site administrator.{{/i18n}}</p>
+            <p class="help">{{#i18n 'registration-failed'}}Registration failed. Please try again and if this error keeps occuring, contact the site administrator.{{/i18n}}</p>
         </div>
         {{/if}}
 
diff --git a/frontend/src/search-box/searchbox-template.hbs b/frontend/src/search-box/searchbox-template.hbs
index 60665f3b..67fc73ca 100644
--- a/frontend/src/search-box/searchbox-template.hbs
+++ b/frontend/src/search-box/searchbox-template.hbs
@@ -5,7 +5,7 @@
             target="_blank">
             <span
                 class="icon is-small tooltip is-tooltip-top"
-                data-tooltip="{{#i18n 'view_operator_docs'}}View documentation of search operators{{/i18n}}"
+                data-tooltip="{{#i18n 'view-operator-docs'}}View documentation of search operators{{/i18n}}"
             >
                 <i class="fas fa-question" aria-hidden="true"></i>
             </span>
@@ -15,7 +15,7 @@
         <input
             class="input"
             type="text"
-            placeholder="{{#i18n 'search_database'}}Search our database{{/i18n}}"
+            placeholder="{{#i18n 'search-database'}}Search our database{{/i18n}}"
         >
     </div>
     <div class="dropdown is-hoverable">
diff --git a/frontend/src/semantic-search/semantic-search-template.hbs b/frontend/src/semantic-search/semantic-search-template.hbs
index 97701dc3..cb88e89f 100644
--- a/frontend/src/semantic-search/semantic-search-template.hbs
+++ b/frontend/src/semantic-search/semantic-search-template.hbs
@@ -6,7 +6,7 @@
             name=label
             maxlength=100
             value="{{label}}"
-            placeholder="{{#i18n 'optional_label_placeholder'}}optional label for reference{{/i18n}}"
+            placeholder="{{#i18n 'optional-label-placeholder'}}optional label for reference{{/i18n}}"
             class="input"
         >
     </div>
diff --git a/frontend/src/snippet/snippet-view.ts b/frontend/src/snippet/snippet-view.ts
index d42d7b8d..d95cfb7a 100644
--- a/frontend/src/snippet/snippet-view.ts
+++ b/frontend/src/snippet/snippet-view.ts
@@ -7,7 +7,7 @@ import FlatItem from '../common-adapters/flat-item-model';
 import snippetTemplate from './snippet-template';
 
 export default class SnippetView extends View<FlatItem> {
-    ellipsis = i18next.t('interpunction.paragraph_ellipsis', '(...)');
+    ellipsis = i18next.t('interpunction.paragraph-ellipsis', '(...)');
     trimmedTitle: boolean;
     trimmedStart: boolean;
     trimmedEnd: boolean;
diff --git a/frontend/src/toolbar/toolbar-template.hbs b/frontend/src/toolbar/toolbar-template.hbs
index 79791a0b..fbb6cafd 100644
--- a/frontend/src/toolbar/toolbar-template.hbs
+++ b/frontend/src/toolbar/toolbar-template.hbs
@@ -1,9 +1,9 @@
-<div class="toolbar-item toolbar-metadata tooltip is-tooltip-left" data-tooltip="{{#i18n 'show_hide_metadata'}}Show / hide the source metadata{{/i18n}}">
+<div class="toolbar-item toolbar-metadata tooltip is-tooltip-left" data-tooltip="{{#i18n 'show-hide-metadata'}}Show / hide the source metadata{{/i18n}}">
     <span class="icon is-large has-text-primary">
         <i class="fas fa-info-circle fa-lg"></i>
     </span>
 </div>
-<div class="toolbar-item toolbar-annotations tooltip is-tooltip-left" data-tooltip="{{#i18n 'show_hide_annotations'}}Show / hide annotations{{/i18n}}">
+<div class="toolbar-item toolbar-annotations tooltip is-tooltip-left" data-tooltip="{{#i18n 'show-hide-annotations'}}Show / hide annotations{{/i18n}}">
     <span class="icon is-large has-text-primary">
         <i class="fas fa-highlighter fa-lg"></i>
     </span>
diff --git a/frontend/src/upload/upload-source-template.hbs b/frontend/src/upload/upload-source-template.hbs
index 73cfc5f7..f35071e8 100644
--- a/frontend/src/upload/upload-source-template.hbs
+++ b/frontend/src/upload/upload-source-template.hbs
@@ -1,5 +1,5 @@
 <header>
-    <h3 class="title is-3 page-header">{{#i18n 'upload_source'}}Upload source{{/i18n}}</h3>
+    <h3 class="title is-3 page-header">{{#i18n 'upload-source'}}Upload source{{/i18n}}</h3>
 </header>