Merge pull request #275 from ydaniel98/text-launch-update

updated text
focallocal · May 19, 2017 · baa3498 · baa3498
2 parents 19aad02 + 23e9854
commit baa3498
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 32 deletions.
diff --git a/both/collections/events.js b/both/collections/events.js
@@ -231,7 +231,7 @@ Events.attachSchema(new SimpleSchema({
     },
     name: {
         type: String,
-        label: 'Event name',
+        label: 'Name',
         max: 100,
         autoform: {
             id: "event-name"
@@ -305,7 +305,7 @@ Events.attachSchema(new SimpleSchema({
     },
     meetingPoint: {
         type: String,
-        label: 'Meeting point',
+        label: 'How to Find',
         max: 100
     },
     findHints: {
@@ -316,7 +316,7 @@ Events.attachSchema(new SimpleSchema({
     },
     dateEvent: {
         type: Date,
-        label: 'Date of the action',
+        label: 'Date',
         autoform: {
             type: 'pickadate',
             pickadateOptions: {

diff --git a/both/i18n/en/app.en.i18n.json b/both/i18n/en/app.en.i18n.json
@@ -40,22 +40,14 @@
       "3": "4. Choose a specific meeting point",
       "4": "5. How will people recognise you?",
       "5": "6. Choose a Date and Time",
-      "6": "7. Description/More Details",
-      "sub": {
-        "0": {
-          "0": "Not sure? Here's a list of suggestions:"
-        }
-      }
+      "6": "7. Description/More Details"
     },
     "btns": {
       "0": "Back",
       "1": "Next",
       "2": "Submit",
       "3": "Suggestions",
-      "4": "Offer a new resource"
-    },
-    "links": {
-      "0": "http://news.focallocal.org/activities-list/"
+      "4": "Something New"
     }
   },
   "editEvent": {
@@ -70,9 +62,9 @@
     }
   },
   "congratsModal": {
-    "title": "Congratulations, your event is LIVE!",
-    "subtitle": "Promote the event now - we've made it super easy for you!",
-    "subtitle_1": "Share with your friends with just one click",
+    "title": "Congratulations!",
+    "subtitle": "We're one step closer to a happier and more connected World",
+    "subtitle_1": "Use the tool below, we've made it super easy for you to reach many more people!",
     "text": {
       "0": "Simply click the buttons above and copy/paste the info below.",
       "1": "with the Focallocal Community",
@@ -82,7 +74,7 @@
         "2": "Address",
         "3": "Meeting point",
         "4": "How to find us",
-        "5": "Event link"
+        "5": "Link"
       },
       "2": "Become a Positive Action Hero and join the Global Movement for Positive Change at www.focallocal.org"
     },
@@ -96,7 +88,7 @@
       "1": "Sitemap",
       "2": "Connect",
       "sub": {
-        "0": "This website is part of",
+        "0": "This website has been created by volunteers at the Focallocal Positive Action Community as part of our mission if local action for global change. Find out more and join us at",
         "1": {
           "list": {
             "0": "Home",
@@ -204,6 +196,9 @@
     },
     "btns": {
       "0": "Toggle All"
+    },
+    "links": {
+      "0": "http://news.focallocal.org/gather-about"
     }
   },
   "event": {
@@ -215,7 +210,7 @@
         "2": "Videos",
         "3": "Comments"
       },
-      "1": "* This event has been reported by",
+      "1": "* This has been reported by",
       "2": "user(s)"
     },
     "btns": {

diff --git a/client/templates/congratsModal/congratsModal.html b/client/templates/congratsModal/congratsModal.html
@@ -31,12 +31,12 @@ <h6>{{_ "congratsModal.subtitle_1"}}</h6>
                     {{name}}: {{category.name}} {{_ "congratsModal.text.1"}} <br />
                     {{_ "congratsModal.text.tags.0"}}: {{description}} <br />
                     {{_ "congratsModal.text.2"}}<br/>
-                    {{_ "congratsModal.text.tag.1"}}: {{printDate dateEvent}} <br />
-                    {{_ "congratsModal.text.tag.2"}}: {{address}} <br />
-                    {{_ "congratsModal.text.tag.3"}}: {{meetingPoint}} <br />
-                    {{_ "congratsModal.text.tag.4"}}: {{findHints}} <br />
+                    {{_ "congratsModal.text.tags.1"}}: {{printDate dateEvent}} <br />
+                    {{_ "congratsModal.text.tags.2"}}: {{address}} <br />
+                    {{_ "congratsModal.text.tags.3"}}: {{meetingPoint}} <br />
+                    {{_ "congratsModal.text.tags.4"}}: {{findHints}} <br />
                     {{#if url}}
-                        {{_ "congratsModal.text.tag.5"}}: <a href="{{url}}" target="_blank">{{url}}</a>
+                        {{_ "congratsModal.text.tags.5"}}: <a href="{{url}}" target="_blank">{{url}}</a>
                     {{/if}}<br />
                   </blockquote>
                 </div>

diff --git a/client/templates/eventConfirmReport/eventConfirmReport.html b/client/templates/eventConfirmReport/eventConfirmReport.html
@@ -1,7 +1,7 @@
 <template name="eventConfirmReport">
 	<div id="{{id}}" class="modal">
 		<div class="modal-content">
-			<h4>Are you sure you want to report this event?</h4>
+			<h4>Are you sure you want to report this?</h4>
 		</div>
 		<div class="modal-footer">
 				<a href="#!" class="yes-btn modal-action modal-close waves-effect waves-amber btn-flat">Yes</a>

diff --git a/client/templates/eventsForm/new/newEvent.html b/client/templates/eventsForm/new/newEvent.html
@@ -10,7 +10,6 @@ <h3 class="txt-center" id="eventTitle">{{_ "newEvent.title"}}</h3>
 							<li class="sequence-field" value="0">
 								<div class="col">
 									<h5>{{_ "newEvent.section_titles.0"}}</h5>
-									<span class="grey-text right-align">{{_ "newEvent.section_titles.sub.0.0"}} <a href="http://news.focallocal.org/activities">news.focallocal.org/activities</a></span>
 								</div>
 								{{> afQuickField name="organiser._id"}}
 								{{> afQuickField name="organiser.name"}}

diff --git a/client/templates/layouts/_footer.html b/client/templates/layouts/_footer.html
@@ -6,7 +6,7 @@
                 <h3 class="white-text">{{_ "_footer.section_titles.0"}}</h3>
 
                 <p class="grey-text text-lighten-4">
-                    {{_ "_footer.section_titles.sub.0"}} <a href="http://www.focallocal.org">{{_ "general.text.focallocal.web"}}</a>
+                    {{_ "_footer.section_titles.sub.0"}} <a href="http://www.focallocal.org">focallocal.org</a>
                 </p>
             </div>
             <div class="col l4 s12">

diff --git a/client/templates/map/map.html b/client/templates/map/map.html
@@ -28,7 +28,8 @@ <h4>{{_ "map.text.0"}}</h4>
         <ul>
             <li><a id="guide-btn" class="btn-floating tooltipped yellow darken-4"
                    data-position="left" data-delay="10" data-tooltip="Guide 4 Success"
-                    href="http://focallocal.org/how-to-create-a-positive-social-action-activity" target="_blank">?</a></li>
+                    href='
+                    {{_ "map.links.0"}}' target="_blank">?</a></li>
         </ul>
     </div>
 

diff --git a/client/templates/welcomeModal/welcomeModal.js b/client/templates/welcomeModal/welcomeModal.js
@@ -83,9 +83,9 @@ Template.welcomeModal.helpers({
 			eventMap.setZoom(12);
 		}
 
-		setTimeout(function() {
-			$("#welcomeModal").show(500);
-			$(".lean-overlay").css({"opacity": 0.5});
-		}, 2000);
+		// setTimeout(function() {
+		// 	$("#welcomeModal").show(500);
+		// 	$(".lean-overlay").css({"opacity": 0.5});
+		// }, 2000);
 	}
 });