Changeset 6088 for extensions/pLoader
- Timestamp:
- May 6, 2010, 10:40:05 PM (14 years ago)
- Location:
- extensions/pLoader/trunk
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
extensions/pLoader/trunk/locale/fr_FR/pLoader.po
r5472 r6088 703 703 msgid "Selection" 704 704 msgstr "Sélection" 705 706 msgid "Your user account is not granted to upload photos" 707 msgstr "Les droits associés à votre compte ne permettent pas le transfert de photos" 708 709 msgid "Add photos for resizing and uploading" 710 msgstr "Ajoute des photos à redimensionner et transférer" 711 712 msgid "Remove selected photos. Original files are not deleted" 713 msgstr "Enlève les photos sélectionnées. Les fichiers originaux ne sont pas supprimés" 714 715 msgid "Change global settings" 716 msgstr "Change les réglages" -
extensions/pLoader/trunk/src/Uploader/GUI/Frame.pm
r6087 r6088 1666 1666 my ( $self, $select_all ) = @_; 1667 1667 1668 return if wxTheApp->CheckUpload; 1668 1669 return if !scalar @{$self->imagelist->sums}; 1669 1670 … … 1826 1827 1, 1827 1828 wxTheApp->resource_path('tb_remove.png'), 1828 gettext("Remove selected photos. Original files are not deleted 1829 gettext("Remove selected photos. Original files are not deleted") 1829 1830 ], 1830 1831 [ … … 1835 1836 0, 1836 1837 wxTheApp->resource_path('tb_settings.png'), 1837 gettext("Change global settings .")1838 gettext("Change global settings") 1838 1839 ], 1839 1840 -
extensions/pLoader/trunk/src/Uploader/GUI/wxApp.pm
r6087 r6088 260 260 # user pressed OK 261 261 if($not_exit){ 262 263 262 $self->StoreConnectionProperties; 263 if( !$self->use_offline ){ 264 264 while( $not_exit and !$self->_is_connected ){ 265 266 265 $not_exit = $self->Login(); 266 last if $self->use_offline; 267 267 } 268 } 268 $self->CheckUpload; 269 } 269 270 $self->_init_imagelist; 270 271 $self->_init_thumbimagelist; 271 272 $self->_set_stored_layout; 272 #$self->_init_frame; 273 } 274 #Wx::LogMessage("bin dir %s", $bin_dir); 273 } 274 275 275 $not_exit; 276 276 } … … 557 557 $use_new_imagelist = 1 unless $self->imagelist_version eq $stored_imagelist->{imagelist_version}; 558 558 } 559 # make sure we really have 559 560 $use_new_imagelist = 1 unless defined $stored_imagelist; 560 561 561 562 if($use_new_imagelist){ 562 563 Wx::LogMessage(gettext("pLoader has to reset image cache.")); 563 564 # and silently clean layout … … 983 984 984 985 986 sub CheckUpload { 987 my ( $self ) = @_; 988 989 my $err_msg = $self->pwg->CheckUpload; 990 991 $err_msg = gettext("Your user account is not granted to upload photos") if 992 'Access denied' eq $err_msg; 993 994 Wx::LogMessage("%s", $err_msg) if $err_msg; 995 996 $err_msg; 997 } 985 998 1; -
extensions/pLoader/trunk/src/Uploader/ImageList.pm
r5472 r6088 1597 1597 } 1598 1598 1599 1600 sub CheckUpload { 1601 my ( $self ) = @_; 1602 1603 $self->pwg->CheckUpload; 1604 } 1605 1599 1606 1; -
extensions/pLoader/trunk/src/Uploader/PWG.pm
r5732 r6088 56 56 } 57 57 else{ 58 $self->GetMethods; 58 59 $self->RefreshCategories; 59 60 $self->RefreshTags; -
extensions/pLoader/trunk/src/Uploader/PWG/WebServices.pm
r5977 r6088 43 43 qry_list_categories 44 44 qry_add_categories 45 qry_list_methods 45 46 qry_list_tags 47 qry_check_upload 46 48 items 47 49 tags … … 71 73 multiple_value_mode 72 74 privacy_level 75 is_method_available 73 76 / 74 77 ); … … 145 148 $self->urlbase, 146 149 'pwg.tags.getAdminList', 150 ); 151 152 $self->qry_list_methods( sprintf 153 "%s/ws.php?format=json&method=%s", 154 $self->urlbase, 155 'reflection.getMethodList', 156 ); 157 158 $self->qry_check_upload( sprintf 159 "%s/ws.php?format=json&method=%s", 160 $self->urlbase, 161 'pwg.images.checkUpload', 147 162 ); 148 163 … … 193 208 }; 194 209 } 195 210 211 if(401 == $self->uagent_response->code){ 212 $hresult->{message} = 'Access denied'; 213 } 214 196 215 $hresult; 197 216 } … … 237 256 return ( $result->is_success, $result->status_line ); 238 257 } 258 239 259 sub GetCategories { 240 260 my ( $self ) = @_; … … 268 288 } 269 289 290 sub CheckUpload { 291 my ( $self ) = @_; 292 293 my $err_msg; 294 295 if($self->is_method_available->{'pwg.images.checkUpload'}){ 296 $self->_execute_get( 297 $self->qry_check_upload 298 ); 299 # my $result = $self->_json_response_content->{result}; 300 my $hresult = $self->_json_response_content; 301 302 $err_msg = 'ok' eq $hresult->{stat} ? 303 $hresult->{result}{message} : 304 $hresult->{message}; 305 } 306 307 $err_msg; 308 } 309 310 sub GetMethods { 311 my ( $self ) = @_; 312 313 $self->_execute_get( 314 $self->qry_list_methods 315 ); 316 317 my $methods = $self->_json_response_content->{result}{methods}; 318 319 $self->is_method_available( 320 {} 321 ); 322 323 map { 324 $self->is_method_available->{$_}++ 325 }@$methods; 326 327 $methods; 328 } 270 329 271 330 sub UploadImage {
Note: See TracChangeset
for help on using the changeset viewer.