changeset 462:62a0adc8cdcd

Merged.
author Sascha L. Teichmann <sascha.teichmann@intevation.de>
date Wed, 22 Aug 2018 16:20:09 +0200
parents 685b886002b8 (current diff) 5845fb6bb4ec (diff)
children 5611cf72cc92
files
diffstat 2 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/client/Makefile	Wed Aug 22 16:18:14 2018 +0200
+++ b/client/Makefile	Wed Aug 22 16:20:09 2018 +0200
@@ -16,7 +16,10 @@
 GETTEXT_JS_SOURCES = $(shell find $(OUTPUT_DIR) -name '*.vue' -o -name '*.js')
 
 # Makefile Targets
-.PHONY: clean makemessages translations
+.PHONY: clean makemessages translations all
+
+all:
+	@echo choose a target from: clean makemessages translations
 
 clean:
 	rm -f /tmp/template.pot $(OUTPUT_DIR)/translations.json
--- a/client/public/index.html	Wed Aug 22 16:18:14 2018 +0200
+++ b/client/public/index.html	Wed Aug 22 16:20:09 2018 +0200
@@ -11,7 +11,8 @@
 
 <body>
   <noscript>
-    <strong>We're sorry but wamosjs doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
+    <strong>This webapplication needs Javascript enabled to run.
+            Please enable it to continue.</strong>
   </noscript>
   <div id="app"></div>
   <!-- built files will be auto injected -->