Merge branch 'staging' of github.com:code-dot-org/code-dot-org into staging

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

Author: deploy-code-org

i18n/hourofcode.com/sync.rb

@@ -1,33 +1,28 @@
 #! /usr/bin/env ruby
 
-# `crowdin-cli upload sources`
-# `crowdin-cli download`
+`crowdin-cli upload sources`
+`crowdin-cli download`
 
 # remove all metadata
-Dir.glob("../../pegasus/sites.v3/hourofcode.com/public/**/*.md").each do |file|
-  File.write(file, File.read(file).gsub("<a style=\"display: block\" href=\"/#join\"><button style=\"float: right;\">Sign up your event</button></a>", ""))
+Dir.glob("../../pegasus/sites.v3/hourofcode.com/public/us/**/*.md").each do |file|
+  File.write(file, File.read(file).gsub(/^.*\*\s\*\s\*/m, ""))
 end
 
-# # remove all metadata
-# Dir.glob("../../pegasus/sites.v3/hourofcode.com/public/us/**/*.md").each do |file|
-#   File.write(file, File.read(file).gsub(/^.*\*\s\*\s\*/m, ""))
-# end
-
-# # remove broken social tags from thanks.md
-# Dir.glob("../../pegasus/sites.v3/hourofcode.com/public/us/**/thanks.md").each do |file|
-#   File.write(file, File.read(file).gsub(/<% facebook.+?\%>/m, ""))
-# end
+# remove broken social tags from thanks.md
+Dir.glob("../../pegasus/sites.v3/hourofcode.com/public/us/**/thanks.md").each do |file|
+  File.write(file, File.read(file).gsub(/<% facebook.+?\%>/m, ""))
+end
 
-# # add social tags to thanks.md
-# Dir.glob("../../pegasus/sites.v3/hourofcode.com/public/us/**/thanks.md").each do |file|
-#   File.write(file, '<% facebook = {:u=>"http://#{request.host}/us"}
-#                       twitter = {:url=>"http://hourofcode.com/", :related=>"codeorg", :hashtags=>"", :text=>hoc_s(:twitter_default_text)}
-#                       twitter[:hashtags] = "HourOfCode" unless hoc_s(:twitter_default_text).include? "#HourOfCode" %>' + File.read(file))
-# end
+# add social tags to thanks.md
+Dir.glob("../../pegasus/sites.v3/hourofcode.com/public/us/**/thanks.md").each do |file|
+  File.write(file, '<% facebook = {:u=>"http://#{request.host}/us"}
+                      twitter = {:url=>"http://hourofcode.com/", :related=>"codeorg", :hashtags=>"", :text=>hoc_s(:twitter_default_text)}
+                      twitter[:hashtags] = "HourOfCode" unless hoc_s(:twitter_default_text).include? "#HourOfCode" %>' + File.read(file))
+end
 
-# # add metadata to resources.md
-# Dir.glob("../../pegasus/sites.v3/hourofcode.com/public/us/**/resources.md").each do |file|
-#   File.write(file, "---\nlayout: wide\nnav: resources_nav\n---" + File.read(file))
-# end
+# add metadata to resources.md
+Dir.glob("../../pegasus/sites.v3/hourofcode.com/public/us/**/resources.md").each do |file|
+  File.write(file, "---\nlayout: wide\nnav: resources_nav\n---" + File.read(file))
+end