From d51132d945d01ee5b0c802bd21f3cfce48f196e8 Mon Sep 17 00:00:00 2001 From: secretrobotron Date: Wed, 14 Jan 2015 17:40:22 -0500 Subject: [PATCH] v1.1.102 --- Gruntfile.js | 2 +- angular-i18n-ignoreKeys.json | 2 +- bower.json | 2 +- gtf-ignored-keys.json | 2 +- locale/en_US/appmaker.json | 14 +++++++++- package.json | 13 +++++---- public/views/appmaker.html | 42 ++++++++++++++-------------- public/views/explore.html | 18 ++++++------ public/views/tools.html | 54 ++++++++++++++++++------------------ 9 files changed, 81 insertions(+), 68 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 9a0b87271..3ddeebfc3 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -206,7 +206,7 @@ module.exports = function (grunt) { grunt.registerTask('default', ['clean', 'jshint', 'jsonlint', 'imagemin']); // Verify code (Read only) - grunt.registerTask('validate', ['jsbeautifier:verify', 'jshint', 'gettext_finder', 'jsonlint']); + grunt.registerTask('validate', ['jsbeautifier:verify', 'jshint', 'gettext_finder', 'jsonlint', 'angular_i18n_finder']); // Run through all pages and test for JS errors // * Requires global install of PhantomJS * diff --git a/angular-i18n-ignoreKeys.json b/angular-i18n-ignoreKeys.json index 0a280f9d7..545eb4aa8 100644 --- a/angular-i18n-ignoreKeys.json +++ b/angular-i18n-ignoreKeys.json @@ -3,4 +3,4 @@ "Fireworks App Description", "Chat App Description", "Teaching kits", "Teaching kits desc", "Events desc", "Amy Burvall", "TeachTemplates", "Webmaker - Sign Up", "Web Literacy", "Tools", "Partner desc", "Partner", "Code desc", "Code", - "Design desc", "Design", "Translate", "Translate desc", "Events" ] + "Design desc", "Design", "Translate", "Translate desc", "Events" ] \ No newline at end of file diff --git a/bower.json b/bower.json index de5c62923..10f9dae05 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "webmaker.org", - "version": "1.1.81", + "version": "1.1.102", "dependencies": { "angular": "1.2.22", "angular-bootstrap": "0.11.1", diff --git a/gtf-ignored-keys.json b/gtf-ignored-keys.json index feed90f0d..6336c4d73 100644 --- a/gtf-ignored-keys.json +++ b/gtf-ignored-keys.json @@ -1,5 +1,5 @@ [ "advanced", "beginner", "intermediate", "Webpages with Thimble", "Are you sure you want to delete this make?", "Confirm", "Created by", "created", "Updated", "updated", "unpublished", "Resources", "Resource Templates", "Remixes with X-Ray Goggles", "NoEventsFound", "Multimedia with Popcorn", "make", "Make", "Details", "Explore", - "DetailsShareTwitterMsg", "guide", "Info", "Did you know Webmaker is also available in", "Webmaker" + "DetailsShareTwitterMsg", "guide", "Info", "Did you know Webmaker is also available in", "Webmaker", "Events" ] diff --git a/locale/en_US/appmaker.json b/locale/en_US/appmaker.json index c2f75c30c..9b17173c4 100644 --- a/locale/en_US/appmaker.json +++ b/locale/en_US/appmaker.json @@ -15,6 +15,18 @@ "message": "Mobile apps made easy", "description": "A pithy phrase about Appmaker" }, + "students": { + "message": "students", + "description": "students" + }, + "business": { + "message": "business", + "description": "business" + }, + "friends": { + "message": "friends", + "description": "friends" + }, "Appmaker Desc": { "message": "Make apps for your phone.", "description": "A very short explanation for what Appmaker is" @@ -23,7 +35,7 @@ "message": "Discover Appmaker", "description": "Title for Appmaker landing page" }, - "Don't know where to start?": { + "Dont know where to start?": { "message": "Looking for an easy way to get started? Remix one of these templates to make your very own app.", "description": "Catch the imagination of users at the top of the page." }, diff --git a/package.json b/package.json index 74065799c..3ee978cbe 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "webmaker.org", - "version": "1.1.101", + "version": "1.1.102", "scripts": { "test": "grunt validate", "postinstall": "bower install && grunt build", @@ -56,14 +56,15 @@ }, "devDependencies": { "colors": "0.6.2", + "grunt-angular-i18n-finder": "0.0.6", + "grunt-contrib-concat": "^0.4.0", "grunt-contrib-imagemin": "0.3.0", "grunt-contrib-jshint": "0.7.1", - "grunt-gettext-finder": "0.0.2", - "grunt-jsbeautifier": "0.2.2", - "grunt-shell": "0.6.1", - "grunt-contrib-concat": "^0.4.0", "grunt-contrib-watch": "^0.6.1", "grunt-express-server": "^0.4.13", - "grunt-jsonlint": "^1.0.4" + "grunt-gettext-finder": "0.0.2", + "grunt-jsbeautifier": "0.2.2", + "grunt-jsonlint": "^1.0.4", + "grunt-shell": "0.6.1" } } diff --git a/public/views/appmaker.html b/public/views/appmaker.html index b972be30b..d0a234393 100644 --- a/public/views/appmaker.html +++ b/public/views/appmaker.html @@ -3,7 +3,7 @@
- {{audience.title | i18n}}{{setActiveSlide(slide.active, $index)}} + {{ audience.title | i18n }}{{setActiveSlide(slide.active, $index)}}
@@ -13,24 +13,24 @@
-

{{'Make an app for your...' | i18n}}.

-

{{'Appmaker Description' | i18n}}

+

{{ 'Make an app for your...' | i18n }}.

+

{{ 'Appmaker Description' | i18n }}

- {{'Pick a template' | i18n}} - {{'Start from scratch' | i18n}} + {{ 'Pick a template' | i18n }} + {{ 'Start from scratch' | i18n }}

-

{{'Don\'t know where to start?' | i18n}}

+

{{ 'Dont know where to start?' | i18n }}

-

{{make.title | i18n}}

-

{{(make.title + ' Description') | i18n}}

+

{{ make.title | i18n }}

+

{{ (make.title + ' Description') | i18n }}

Remix @@ -48,39 +48,39 @@

{{make.title | i18n}}

- -

{{'Teach' | i18n}}

-

{{'Teach Description' | i18n}}

+ +

{{ 'Teach' | i18n }}

+

{{ 'Teach Description' | i18n }}

- {{'See how' | i18n}} + {{ 'See how' | i18n }}

- -

{{'Contribute' | i18n}}

-

{{'Contribute Description' | i18n}}

+ +

{{ 'Contribute' | i18n }}

+

{{ 'Contribute Description' | i18n }}

- {{'Get started' | i18n}} + {{ 'Get started' | i18n }}

- -

{{'Imagine' | i18n}}

-

{{'Imagine Description' | i18n}}

+ +

{{ 'Imagine' | i18n }}

+

{{ 'Imagine Description' | i18n }}

- {{'Learn more' | i18n}} + {{ 'Learn more' | i18n }}

diff --git a/public/views/explore.html b/public/views/explore.html index e69bfd8ae..fddde9ec1 100644 --- a/public/views/explore.html +++ b/public/views/explore.html @@ -55,30 +55,30 @@

-

{{'X-Ray Goggles' | i18n}}

+

{{ 'X-Ray Goggles' | i18n }}

{{ 'X-Ray Desc' | i18n }}

-

{{'Thimble' | i18n}}

+

{{ 'Thimble' | i18n }}

 -

{{'Thimble Desc' | i18n }}

+

{{ 'Thimble Desc' | i18n }}

-

{{'Popcorn Maker'}}

+

{{ 'Popcorn Maker'}}

 -

{{'Popcorn Maker Desc'| i18n}}

+

{{ 'Popcorn Maker Desc'| i18n }}

-

{{'Appmaker' | i18n}}

+

{{ 'Appmaker' | i18n }}

 -

{{'Appmaker Desc' | i18n}}

+

{{ 'Appmaker Desc' | i18n }}

@@ -105,7 +105,7 @@

{{ 'Make. Learn. Get together.' | i18n }}

-

{{'Contribute to Webmaker' | i18n }}

+

{{ 'Contribute to Webmaker' | i18n }}

@@ -131,7 +131,7 @@

{{box.title | i18n }}

-

{{'Footer header' | i18n}}

+

{{ 'Footer header' | i18n }}

diff --git a/public/views/tools.html b/public/views/tools.html index 7875e2ebd..537cf5e9d 100644 --- a/public/views/tools.html +++ b/public/views/tools.html @@ -17,7 +17,7 @@

{{ 'You can build:' | i18n }}

  • {{ 'a custom homepage for the New York Times' | i18n }}
  • {{ 'an alternate version of a controversial webpage' | i18n }}
    • -
  • {{ "a funny remix of your best friend's favorite site" | i18n }}
    • +
  • {{ 'a funny remix of your best friend's favorite site' | i18n }}
  • {{ 'and more!' | i18n }}
@@ -38,18 +38,18 @@

{{ 'Thimble' | i18n }}

{{ 'Webmaking made easy' | i18n }}

-

{{ "toolsThimbleDesc" | i18n }}

-

{{ "You can build:" | i18n }}

+

{{ 'toolsThimbleDesc' | i18n }}

+

{{ 'You can build:' | i18n }}

    -
  • {{ "a personalized greeting card" | i18n }}
    • -
  • {{ "an online poster for your favorite movie" | i18n }}
    • -
  • {{ "a hilarious meme" | i18n }}
    • -
  • {{ "and more!" | i18n }}
    • +
  • {{ 'a personalized greeting card' | i18n }}
    • +
  • {{ 'an online poster for your favorite movie' | i18n }}
    • +
  • {{ 'a hilarious meme' | i18n }}
    • +
  • {{ 'and more!' | i18n }}
-

{{ "Get started" | i18n }}

+

{{ 'Get started' | i18n }}

- {{ "Start from scratch" | i18n }} + {{ 'Start from scratch' | i18n }}

{{ 'Remix a make' | i18n }}

@@ -62,22 +62,22 @@

{{ "Get started" | i18n }}

-

{{ "Popcorn Maker" | i18n }}

-

{{ "Supercharge web video" | i18n }}

+

{{ 'Popcorn Maker' | i18n }}

+

{{ 'Supercharge web video' | i18n }}
-

{{ "toolsPMDesc" | i18n }}

-

{{ "You can build:" | i18n }}

+

{{ 'toolsPMDesc' | i18n }}

+

{{ 'You can build:' | i18n }}

    -
  • {{ "an animated gif with sound" | i18n }}
    • -
  • {{ "a documentary with dynamic links" | i18n }}
    • -
  • {{ "vdo-profile" | i18n }}
    • -
  • {{ "and more!" | i18n }}
    • +
  • {{ 'an animated gif with sound' | i18n }}
    • +
  • {{ 'a documentary with dynamic links' | i18n }}
    • +
  • {{ 'vdo-profile' | i18n }}
    • +
  • {{ 'and more!' | i18n }}
-

{{ "Get started" | i18n }}

+

{{ 'Get started' | i18n }}

- {{ "Start from scratch" | i18n }}

+ {{ 'Start from scratch' | i18n }}

{{ 'Remix a make' | i18n }}

@@ -90,22 +90,22 @@

{{ "Get started" | i18n }}

-

{{ "Appmaker" | i18n }}

-

{{ "Mobile apps made easy" | i18n }}

+

{{ 'Appmaker' | i18n }}

+

{{ 'Mobile apps made easy' | i18n }}

{{ 'Appmaker Description' | i18n }}

{{ 'You can build:' | i18n }}

    -
  • {{ "an app to chat with your friends" | i18n }}
    • -
  • {{ "a music-making app" | i18n }}
    • -
  • {{ "a personal goal tracker" | i18n }}
    • -
  • {{ "and more!" | i18n }}
    • +
  • {{ 'an app to chat with your friends' | i18n }}
    • +
  • {{ 'a music-making app' | i18n }}
    • +
  • {{ 'a personal goal tracker' | i18n }}
    • +
  • {{ 'and more!' | i18n }}
-

{{ "Get started" | i18n }}

+

{{ 'Get started' | i18n }}

- {{ "Start from scratch" | i18n }}

+ {{ 'Start from scratch' | i18n }}

{{ 'Remix a make' | i18n }}