diff --git a/apps/routerconsole/java/src/net/i2p/router/web/JobQueueHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/JobQueueHelper.java index 7510044fa1..901737661b 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/JobQueueHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/JobQueueHelper.java @@ -47,28 +47,29 @@ public class JobQueueHelper extends HelperBase { int numRunners = _context.jobQueue().getJobs(readyJobs, timedJobs, activeJobs, justFinishedJobs); StringBuilder buf = new StringBuilder(32*1024); - buf.append("

I2P Job Queue


Job runners: ").append(numRunners); - buf.append("
\n"); + buf.append("

").append(_("I2P Job Queue")).append("


") + .append(_("Job runners")).append(": ").append(numRunners) + .append("
\n"); long now = _context.clock().now(); - buf.append("
Active jobs: ").append(activeJobs.size()).append("
    \n"); + buf.append("
    ").append(_("Active jobs")).append(": ").append(activeJobs.size()).append("
      \n"); for (int i = 0; i < activeJobs.size(); i++) { Job j = activeJobs.get(i); - buf.append("
    1. [started ").append(DataHelper.formatDuration2(now-j.getTiming().getStartAfter())).append(" ago]: "); + buf.append("
    2. (").append(_("started {0} ago", DataHelper.formatDuration2(now-j.getTiming().getStartAfter()))).append("): "); buf.append(j.toString()).append("
    3. \n"); } buf.append("
    \n"); - buf.append("
    Just finished jobs: ").append(justFinishedJobs.size()).append("
      \n"); + buf.append("
      ").append(_("Just finished jobs")).append(": ").append(justFinishedJobs.size()).append("
        \n"); for (int i = 0; i < justFinishedJobs.size(); i++) { Job j = justFinishedJobs.get(i); - buf.append("
      1. [finished ").append(DataHelper.formatDuration2(now-j.getTiming().getActualEnd())).append(" ago]: "); + buf.append("
      2. (").append(_("finished {0} ago", DataHelper.formatDuration2(now-j.getTiming().getActualEnd()))).append("): "); buf.append(j.toString()).append("
      3. \n"); } buf.append("
      \n"); - buf.append("
      Ready/waiting jobs: ").append(readyJobs.size()).append("
        \n"); + buf.append("
        ").append(_("Ready/waiting jobs")).append(": ").append(readyJobs.size()).append("
          \n"); ObjectCounter counter = new ObjectCounter(); for (int i = 0; i < readyJobs.size(); i++) { Job j = readyJobs.get(i); @@ -85,7 +86,7 @@ public class JobQueueHelper extends HelperBase { out.write(buf.toString()); buf.setLength(0); - buf.append("
          Scheduled jobs: ").append(timedJobs.size()).append("
            \n"); + buf.append("
            ").append(_("Scheduled jobs")).append(": ").append(timedJobs.size()).append("
              \n"); long prev = Long.MIN_VALUE; counter.clear(); for (int i = 0; i < timedJobs.size(); i++) { @@ -94,8 +95,9 @@ public class JobQueueHelper extends HelperBase { if (i >= MAX_JOBS) continue; long time = j.getTiming().getStartAfter() - now; - buf.append("
            1. ").append(j.getName()).append(" in "); - buf.append(DataHelper.formatDuration2(time)); + // translators: {0} is a job name, {1} is a time, e.g. 6 min + buf.append("
            2. ").append(_("{0} will start in {1}", j.getName(), DataHelper.formatDuration2(time))); + // debug, don't bother translating if (time < 0) buf.append(" DELAYED"); if (time < prev) @@ -108,22 +110,22 @@ public class JobQueueHelper extends HelperBase { out.write(buf.toString()); buf.setLength(0); - buf.append("
              Total Job Stats\n"); + buf.append("
              ").append(_("Total Job Statistics")).append("\n"); getJobStats(buf); out.write(buf.toString()); } /** @since 0.9.5 */ - private static void getJobCounts(StringBuilder buf, ObjectCounter counter) { + private void getJobCounts(StringBuilder buf, ObjectCounter counter) { List names = new ArrayList(counter.objects()); if (names.size() < 4) return; buf.append("\n" + - "\n"); } buf.append("
              JobQueued"); + "
              ").append(_("Job")).append("").append(_("Queued")).append(""); Collections.sort(names, new JobCountComparator(counter)); for (String name : names) { buf.append("
              ").append(name) - .append("").append(counter.count(name)) + .append("").append(counter.count(name)) .append("
              \n"); @@ -136,9 +138,11 @@ public class JobQueueHelper extends HelperBase { */ private void getJobStats(StringBuilder buf) { buf.append("\n" + - "" + - "" + - "\n"); + "" + + "" + + "\n"); long totRuns = 0; long totExecTime = 0; long avgExecTime = 0; @@ -186,7 +190,7 @@ public class JobQueueHelper extends HelperBase { } buf.append(""); - buf.append(""); + buf.append(""); buf.append(""); buf.append(""); buf.append("");
              JobRunsTimeAvgMaxMinPendingAvgMaxMin
              ").append(_("Job")).append("").append(_("Runs")).append("").append(_("Time")).append("").append(_("Avg")).append("") + .append(_("Max")).append("").append(_("Min")).append("").append(_("Pending")).append("").append(_("Avg")).append("") + .append(_("Max")).append("").append(_("Min")).append("
              ").append("SUMMARY").append("").append(_("Summary")).append("").append(totRuns).append("").append(DataHelper.formatDuration2(totExecTime)).append("").append(DataHelper.formatDuration2(avgExecTime)).append("