diff options
| author | Greg Froese <greg.froese@gmail.com> | 2009-10-19 05:34:47 +0000 |
|---|---|---|
| committer | Greg Froese <greg.froese@gmail.com> | 2009-10-19 05:34:47 +0000 |
| commit | 81b8ba32beb3151025d3b390c0621e074bceae36 (patch) | |
| tree | 716dc1767fefdd42f1a295f3b01d7d78855684d1 /actions | |
| parent | aef5c5a559959b3ffc1c1100752ba4a961ac432c (diff) | |
| download | elgg-81b8ba32beb3151025d3b390c0621e074bceae36.tar.gz elgg-81b8ba32beb3151025d3b390c0621e074bceae36.tar.bz2 | |
flickr integration changes
Diffstat (limited to 'actions')
| -rw-r--r-- | actions/flickrImportPhotoset.php | 4 | ||||
| -rw-r--r-- | actions/flickrSetup.php | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/actions/flickrImportPhotoset.php b/actions/flickrImportPhotoset.php index d28ea8564..ec0d65b5d 100644 --- a/actions/flickrImportPhotoset.php +++ b/actions/flickrImportPhotoset.php @@ -18,7 +18,7 @@ $user = get_loggedin_user(); $flickr_id = get_metadata_byname( $user->guid, "flickr_id" ); if( empty( $flickr_id )) { - register_error( "You must enter a username" ); + register_error( elgg_echo( 'flickr:errorusername2' )); forward( $return_url ); die; //just in case } @@ -33,7 +33,7 @@ foreach( $photos["photoset"]["photo"] as $photo ) { //check if we already have this image $meta = get_metadata_byname( $user->guid, $photo["id"] ); if( $meta->value == 1 ) { //we've downloaded this already - register_error( "This image has already been imported" ); + register_error( elgg_echo( 'flickr:errorimageimport' )); continue; } //store this so we don't download the same photo multiple times diff --git a/actions/flickrSetup.php b/actions/flickrSetup.php index 2a1f82315..fbc519b02 100644 --- a/actions/flickrSetup.php +++ b/actions/flickrSetup.php @@ -11,7 +11,7 @@ $return_url = get_input( "return_url" ); $user = get_loggedin_user(); if( empty( $flickr_username )) { - register_error( "You must enter a username" ); + register_error( elgg_echo( 'flickr:enterusername' )); forward( $return_url ); die; //just in case } else { @@ -24,11 +24,11 @@ if( empty( $flickr_username )) { $album = get_entity( $album_id ); } - system_message( "Successfully saved Flickr username of $flickr_username" ); - system_message( "flickr user id: $flickr_user[id]" ); - system_message( "Album saved - $album->title" ); + system_message( sprintf( elgg_echo( 'flickr:savedusername' ), $flickr_username )); + system_message( sprintf( elgg_echo( 'flickr:saveduserid' ), $flickr_user["id"] )); + system_message( sprintf( elgg_echo( 'flickr:savedalbum' ), $album->title )); } else { - register_error( "Username $flickr_username not found on Flickr" ); + register_error( sprintf( elgg_echo( 'flickr:errorusername' ), $flickr_username )); } } |