Update names, pick via random sample

diff --git a/app/views/site/welcome.html.erb b/app/views/site/welcome.html.erb
index 56159e29733bc2ac780d248cd9f6fc126a338da2..d3cb7392f1868af9f3ed0a614afe928b7644e5ff 100644 (file)
--- a/app/views/site/welcome.html.erb
+++ b/app/views/site/welcome.html.erb
@@ -16,8 +16,8 @@
   <div class='center one-map'>
     <div class='sprite large one-map'>
       <span class='one-map-name one-map-project-name'><%= t "layouts.project_name.title" %></span>
   <div class='center one-map'>
     <div class='sprite large one-map'>
       <span class='one-map-name one-map-project-name'><%= t "layouts.project_name.title" %></span>

-      <% 1.upto(6) do |i| %>
-        <span class='one-map-name one-map-name-<%= i %>'><%= t "welcome_page.section_1.name_#{i}" %></span>
+      <% t("welcome_page.section_1.names").sample(6).each_with_index do |name, i| %>
+        <span class='one-map-name one-map-name-<%= i+1 %>'><%= name %></span>

       <% end %>
     </div>
   </div>
       <% end %>
     </div>
   </div>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 378b3d4b0061c5a08aa1948a11da3d2c7472b5d4..fcb13bde0b7bc131b4ea612190e4b9bc8f431674 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1164,12 +1164,16 @@ en:
         will be available to all of these sites and applications. Copying the map data from
         place to place can take from a few minutes to a few hours, so don't worry if it isn't
         instant.
         will be available to all of these sites and applications. Copying the map data from
         place to place can take from a few minutes to a few hours, so don't worry if it isn't
         instant.

-      name_1: MapBox
-      name_2: Craigslist
-      name_3: GPS Maps
-      name_4: Skobbler
-      name_5: Stamen
-      name_6: MapQuest Open
+      names:
+        - Apple
+        - Craigslist
+        - Flickr
+        - Foursquare
+        - Garmin
+        - Le Monde
+        - MapQuest
+        - Telenav
+        - USA Today

     section_2:
       title: What's on the Map
       on_html: |
     section_2:
       title: What's on the Map
       on_html: |