diff options
| -rw-r--r-- | .travis.yml | 5 | ||||
| -rw-r--r-- | locales/en.json | 2 | ||||
| -rw-r--r-- | locales/nl.json | 2 | ||||
| -rw-r--r-- | public/views/hackmd/body.ejs | 4 |
4 files changed, 9 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index a4a2e743..ee936e57 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,7 @@ cache: yarn env: global: - CXX=g++-4.8 + - YARN_VERSION=1.3.2 jobs: include: @@ -11,13 +12,13 @@ jobs: node_js: - 6 before_install: - - curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.1.0 + - curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version "$YARN_VERSION" - export PATH="$HOME/.yarn/bin:$PATH" - env: task=npm-test node_js: - 7 before_install: - - curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.1.0 + - curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version "$YARN_VERSION" - export PATH="$HOME/.yarn/bin:$PATH" - env: task=ShellCheck script: diff --git a/locales/en.json b/locales/en.json index 2ab286bb..6b2a2066 100644 --- a/locales/en.json +++ b/locales/en.json @@ -29,6 +29,8 @@ "Import from browser": "Import from browser", "Releases": "Releases", "Are you sure?": "Are you sure?", + "Do you really want to delete this note?": "Do you really want to delete this note?", + "All users will lose their connection.": "All users will lose their connection.", "Cancel": "Cancel", "Yes, do it!": "Yes, do it!", "Choose method": "Choose method", diff --git a/locales/nl.json b/locales/nl.json index 03e3abfc..325c273d 100644 --- a/locales/nl.json +++ b/locales/nl.json @@ -29,6 +29,8 @@ "Import from browser": "Importeer van browser", "Releases": "Releases", "Are you sure?": "Weet je het zeker?", + "Do you really want to delete this note?": "Will je deze notitie echt verwijderen?", + "All users will lose their connection.": "Alle gebruikers zullen hun verbinding verliezen.", "Cancel": "Stoppen", "Yes, do it!": "Ja, doe het!", "Choose method": "Kies methode", diff --git a/public/views/hackmd/body.ejs b/public/views/hackmd/body.ejs index ad1e748b..91343ef6 100644 --- a/public/views/hackmd/body.ejs +++ b/public/views/hackmd/body.ejs @@ -234,8 +234,8 @@ <h4 class="modal-title" id="myModalLabel"><%= __('Are you sure?') %></h4> </div> <div class="modal-body" style="color:black;"> - <h5 class="ui-delete-modal-msg">Do you really want to delete this note?</h5> - <strong class="ui-delete-modal-item">All users will lost their connection.</strong> + <h5 class="ui-delete-modal-msg"><%= __('Do you really want to delete this note?') %></h5> + <strong class="ui-delete-modal-item"><%= __('All users will lose their connection.') %></strong> </div> <div class="modal-footer"> <button type="button" class="btn btn-default" data-dismiss="modal"><%= __('Cancel') %></button> |