From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Wed, 2 Dec 2009 16:05:20 +0000 (+0000)
Subject: Potlatch 1.3b: It's like Potlatch 1.3a without all the bugs
X-Git-Tag: live~6571
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/26279b55cac5dc889bdfbe276d1127683a15809b?ds=inline;hp=74e0acf0f533d50da51a59c8ee34b72e9c03c258

Potlatch 1.3b: It's like Potlatch 1.3a without all the bugs

 * Don't say you're posting to Twitter when you're posting to identi.ca
 * Make "Warning!" translatable
 * Refer to Twitter/Identi.ca as "Microblog"
 * Debug: Print the i18n-key as an error when it can't be found, only visible during hacking (when something goes wrong)
---

diff --git a/config/potlatch/locales/en.yml b/config/potlatch/locales/en.yml
index e00a08773..90115c49f 100644
--- a/config/potlatch/locales/en.yml
+++ b/config/potlatch/locales/en.yml
@@ -38,7 +38,7 @@ en:
   advice_revertingway: Reverting to last saved way (Z to undo)
   advice_tagconflict: Tags don't match - please check (Z to undo)
   advice_toolong: Too long to unlock - please split into shorter ways
-  advice_twatted: Updated your Twitter status
+  advice_microblogged: Updated your $1 status
   advice_uploadempty: Nothing to upload
   advice_uploadfail: Upload stopped
   advice_uploadsuccess: All data successfully uploaded
@@ -66,7 +66,7 @@ en:
   error_nosharedpoint: Ways $1 and $2 don't share a common point any more, so I can't undo the split.
   error_noway: Way $1 cannot be found (perhaps you've panned away?) so I can't undo.
   error_readfailed: Sorry - the OpenStreetMap server didn't respond when asked for data.\n\nWould you like to try again?
-  error_twitter_long: "Posting to Twitter failed:\nHTTP code: $1\nError message: $2\nTwitter error: $3"
+  error_microblog_long: "Posting to $1 failed:\nHTTP code: $2\nError message: $3\n$1 error: $4"
   existingrelation: Add to an existing relation
   findrelation: Find a relation containing
   gpxpleasewait: Please wait while the GPX track is processed.
@@ -106,9 +106,11 @@ en:
   login_title: Couldn't log in
   login_uid: "Username:"
   mail: Mail
+  microblog_name_twitter: Twitter
+  microblog_name_identica: Identi.ca
   more: More
   newchangeset: "\nPlease try again: Potlatch will start a new changeset."
-  "no": "No"
+  no: No
   nobackground: No background
   norelations: No relations in current area
   offset_broadcanal: Broad canal towpath
@@ -137,8 +139,8 @@ en:
   option_thinareas: Use thinner lines for areas
   option_thinlines: Use thin lines at all scales
   option_tiger: Highlight unchanged TIGER
-  option_twitterid: "Twitter name:"
-  option_twitterpwd: "Twitter password:"
+  option_microblog_id: "Microblog name:"
+  option_microblog_pwd: "Microblog password:"
   option_warnings: Show floating warnings
   point: Point
   preset_icon_airport: Airport
@@ -182,7 +184,7 @@ en:
   prompt_savechanges: Save changes
   prompt_taggedpoints: Some of the points on this way are tagged. Really delete?
   prompt_track: Convert GPS track to ways
-  prompt_twitter: Post to Twitter ($1 left)
+  prompt_microblog: Post to $1 ($2 left)
   prompt_unlock: Click to unlock
   prompt_welcome: Welcome to OpenStreetMap!
   retry: Retry
@@ -216,4 +218,4 @@ en:
   uploading_way_name: Uploading way $1, $2
   warning: Warning!
   way: Way
-  "yes": "Yes"
+  yes: Yes
diff --git a/public/potlatch/potlatch.swf b/public/potlatch/potlatch.swf
index 9e77e2995..aa8a566ff 100644
Binary files a/public/potlatch/potlatch.swf and b/public/potlatch/potlatch.swf differ