Fix-up strings for fetch-op

sguiheux · Sep 4, 2011 · 261b1a6 · 261b1a6
1 parent 67661e7
commit 261b1a6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/agit/res/values/strings.xml b/agit/res/values/strings.xml
@@ -66,11 +66,12 @@
     <string name="pulling_repo">"Pulling %1$s"</string>
     <string name="fetch">"Fetch"</string>
     <string name="fetching">"Fetching"</string>
+    <string name="fetched_from_remote_on_repo">"Fetched from %1$s on %2$s"</string>
+    <string name="fetching_from_remote_on_repo">"Fetching from %1$s on %2$s"</string>
     <string name="delete_repo">"Delete Repo"</string>
 
 
     <string name="pulling_from_remote_on_repo">"Pulling from %1$s on %2$s"</string>
-    <string name="fetching_from_remote_on_repo">"Fetching from %1$s on %2$s"</string>
     <string name="pulled_from_remote">"Pulled from %1$s"</string>
     <string name="merge_status">"Merge status : %1$s"</string>
 

diff --git a/agit/src/main/java/com/madgag/agit/operations/Fetch.java b/agit/src/main/java/com/madgag/agit/operations/Fetch.java
@@ -15,9 +15,9 @@
 import static android.R.drawable.stat_sys_download;
 import static android.R.drawable.stat_sys_download_done;
 import static com.madgag.agit.R.string.*;
+import static com.madgag.agit.R.string.fetched_from_remote_on_repo;
 import static com.madgag.agit.git.Repos.niceNameFor;
 import static com.madgag.agit.git.Repos.uriForRemote;
-import static org.eclipse.jgit.lib.Constants.DEFAULT_REMOTE_NAME;
 
 public class Fetch extends GitOperation {
 
@@ -50,7 +50,7 @@ public int getOngoingIcon() {
 	public OpNotification execute() {
 		Log.d(TAG, "start execute() : repository=" + repository+" remote="+remote);
 		FetchResult r = fetchService.fetch(remote, toFetch);
-		return new OpNotification(stat_sys_download_done,"Fetch complete", "Fetched "+remote, fetchUrl);
+		return new OpNotification(stat_sys_download_done, str_operationCompleted(), string(fetched_from_remote_on_repo, remote, niceNameFor(repository)), fetchUrl);
     }
 
 	public String getName() {