Merge pull request #25 from mraible/21-alchohol-label

#21: Change "Did you drink?" to "Did you drink responsibly?"
mraible · Dec 19, 2015 · 3058a6b · 3058a6b
2 parents 19a34e8 + ece09cb
commit 3058a6b
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/src/main/webapp/i18n/en/main.json b/src/main/webapp/i18n/en/main.json
@@ -8,7 +8,7 @@
         "question": "If you have any questions about the JHipster Mini-Book or 21-Points:",
         "link": {
             "homepage": "JHipster Mini-Book Blog",
-            "stackoverflow": "JHipster Mini-Book on Stack Overflow",
+            "stackoverflow": "JHipster on Stack Overflow",
             "contact": "Contact @jhipster_book on Twitter",
             "issues": "Report an issue with 21 Points"
         },

diff --git a/src/main/webapp/i18n/en/points.json b/src/main/webapp/i18n/en/points.json
@@ -18,7 +18,7 @@
             "date": "Date",
             "exercise": "Did you exercise?",
             "meals": "Did you eat well?",
-            "alcohol": "Did you drink?",
+            "alcohol": "Did you drink responsibly?",
             "notes": "Notes",
             "user": "User",
             "actions": "Actions"

diff --git a/src/main/webapp/i18n/fr/main.json b/src/main/webapp/i18n/fr/main.json
@@ -8,7 +8,7 @@
         "question": "Si vous avez des questions sur le JHipster Mini-Book ou sur 21-Points:",
         "link": {
             "homepage": "JHipster Mini-Book Blog",
-            "stackoverflow": "JHipster Mini-Book on Stack Overflow",
+            "stackoverflow": "JHipster on Stack Overflow",
             "contact": "Contactez @jhipster_book sur Twitter",
             "issues": "Remontez un bug sur 21-Points"
         },

diff --git a/src/main/webapp/scripts/app/main/main.html b/src/main/webapp/scripts/app/main/main.html
@@ -125,8 +125,8 @@ <h4 class="m-t-md" translate="main.weight">Weight:</h4>
                     <ul id="resources">
                         <li><a href="http://www.jhipster-book.com" target="_blank"
                                translate="main.link.homepage">JHipster homepage</a></li>
-                        <li><a href="http://stackoverflow.com/tags/jhipster-mini-book/info" target="_blank"
-                               translate="main.link.stackoverflow">JHipster Mini-Book on Stack Overflow</a></li>
+                        <li><a href="http://stackoverflow.com/tags/jhipster/info" target="_blank"
+                               translate="main.link.stackoverflow">JHipster on Stack Overflow</a></li>
                         <li><a href="https://twitter.com/jhipster_book" target="_blank"
                                translate="main.link.contact">Contact @java_hipster on Twitter</a></li>
                         <li><a href="https://github.com/mraible/21-points/issues" target="_blank"