Permalink
Browse files

Merge branch 'pirate'

  • Loading branch information...
2 parents eec4ced + fdcb1d2 commit 880e62b7b36d08314a863f3b27112c9139c5a9db aimee daniells committed Jun 10, 2010
Showing with 6 additions and 6 deletions.
  1. +3 −3 app/views/geohashes/show.pdf.prawn
  2. +2 −2 config/locales/defaults/en-PIRATE.yml
  3. +1 −1 config/locales/en-PIRATE.yml
View
6 app/views/geohashes/show.pdf.prawn
@@ -9,7 +9,7 @@ pdf.move_down 5
pdf.text t('.poster.the_internet_was_here'), :style => :italic, :size => 18
pdf.move_down 10
-pdf.font_size 12 do
+pdf.font_size 11 do
pdf.text t('.poster.some_geohashers')
pdf.text @geohash.latitude_longitude_display, :style => :italic
pdf.text t('.poster.on_date', :date => l(@geohash.date, :format => :long))
@@ -23,7 +23,7 @@ pdf.move_up 133
pdf.image open(URI.escape(@geohash.google_map(request, 17, 'hybrid'))), :height => 133, :position => :right
pdf.move_down 20
-pdf.font_size 12 do
+pdf.font_size 11 do
pdf.text t('.poster.geohashing_is_an_adventure_game')
pdf.text t('.poster.an_algorithm_generates_random_coordinates')
pdf.text t('.poster.to_find_out_more', :link => 'http://geohashing.org')
@@ -35,7 +35,7 @@ pdf.move_down 5
pdf.image open(@geohash.coordinate_calculation_image), :width => 410
pdf.move_down 20
-pdf.font_size 12 do
+pdf.font_size 11 do
pdf.text t('.poster.now_that_you_have_seen_this_poster')
pdf.text t('.poster.the_place_to_talk')
pdf.text @geohash.wiki_link, :style => :bold
View
4 config/locales/defaults/en-PIRATE.yml
@@ -30,9 +30,9 @@
date:
formats:
- default: "%d/%m/%Y"
+ default: "%Y-%m-%d"
short: "%a %d %b"
- long: "%A, %d %B %Y"
+ long: "Day %e o' the month o' %B in the year %Y"
day_names: [Sunday, Monday, Tuesday, Wednesday, Thursday, Friday, Saturday]
abbr_day_names: [Sun, Mon, Tue, Wed, Thu, Fri, Sat]
month_names: [~, January, February, March, April, May, June, July, August, September, October, November, December]
View
2 config/locales/en-PIRATE.yml
@@ -181,7 +181,7 @@
xkcd_geohashing: "xkcd geohashin'"
the_internet_was_here: "The internet bin 'ere, yarr!"
some_geohashers: "In partickler, a crew o' geohashers\nwere at the geographic co-ordinates"
- on_date: "on {{date}} (Gregorian calendar)"
+ on_date: "on {{date}}"
geohashing_is_an_adventure_game: "Geohashin' be a swashbucklin' game."
an_algorithm_generates_random_coordinates: "An algae-rhythm be spewin' random co-ordinates daily, 'n people be tryin' t' get thar t' spy new places, take a drop o' rum wi' new shipmates, 'n have fun in the doin' o' it."
to_find_out_more: "T' be learnin' more or t' join in the antics yerself, sail over t' {{link}}"

0 comments on commit 880e62b

Please sign in to comment.