diff options
| author | Chad Kieffer <ckieffer@gmail.com> | 2009-07-21 00:06:11 -0600 |
|---|---|---|
| committer | Chad Kieffer <ckieffer@gmail.com> | 2009-07-21 00:06:11 -0600 |
| commit | 7f9e71d8cdcf99267adc2b4a6332e379a0fca0fc (patch) | |
| tree | 1ee75c57e9caf682799b9fc7e19f009d27c15f08 /modules/server_add/controllers | |
| parent | 329b6ce28ce0424303fece0fa0f542a0f1cb39ae (diff) | |
| parent | d7814f37cb2194098bd8aa3887bd830033200e8b (diff) | |
Merge branch 'master' of git@github.com:gallery/gallery3
Diffstat (limited to 'modules/server_add/controllers')
| -rw-r--r-- | modules/server_add/controllers/server_add.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/server_add/controllers/server_add.php b/modules/server_add/controllers/server_add.php index 0be0f698..f68392ce 100644 --- a/modules/server_add/controllers/server_add.php +++ b/modules/server_add/controllers/server_add.php @@ -239,7 +239,7 @@ class Server_Add_Controller extends Admin_Controller { $entry->save(); } $task->set("completed_files", $completed_files); - $task->status = t("Adding photos and albums (%completed of %total)", + $task->status = t("Adding photos / albums (%completed of %total)", array("completed" => $completed_files, "total" => $total_files)); $task->percent_complete = 10 + 100 * ($completed_files / $total_files); @@ -252,7 +252,7 @@ class Server_Add_Controller extends Admin_Controller { $task->percent_complete = 100; ORM::factory("server_add_file")->where("task_id", $task->id)->delete_all(); message::info(t2("Successfully added one photo / album", - "Successfully added %count photos and albums", + "Successfully added %count photos / albums", $task->get("completed_files"))); } } |