[Feature] 翻译，并增加设置导航

apps/ops/templates/ops/task_detail.html

@@ -65,7 +65,7 @@
                                             <td><b>{{ object.adhoc.all |length }}</b></td>
                                         </tr>
                                         <tr>
-                                            <td>{% trans 'Last version' %}</td>
+                                            <td>{% trans 'Latest version' %}</td>
                                             <td><b>{{ object.get_latest_adhoc.short_id }}</b></td>
                                         </tr>
                                         <tr>
@@ -85,7 +85,7 @@
                                             <td><b>{{ object.get_latest_history.is_success|yesno:"Yes,No,Unkown" }}</b></td>
                                         </tr>
                                         <tr>
-                                            <td>{% trans 'Conents' %}:</td>
+                                            <td>{% trans 'Contents' %}:</td>
                                             <td>
                                                 <b>
                                                 {% for task in object.get_latest_adhoc.tasks %}

apps/templates/_nav.html

@@ -35,24 +35,24 @@
     </ul>
 </li>
 
-<li id="terminal">
+<li id="ops">
     <a>
-        <i class="fa fa-rocket"></i> <span class="nav-label">{% trans 'Terminal' %}</span><span class="fa arrow"></span>
+        <i class="fa fa-coffee"></i> <span class="nav-label">{% trans 'Job Center' %}</span><span class="fa arrow"></span>
     </a>
     <ul class="nav nav-second-level">
-        <li id="terminal"><a href="{% url 'terminal:terminal-list' %}">{% trans 'Terminal' %}</a></li>
-        <li id="session-online"><a href="{% url 'terminal:session-online-list' %}">{% trans 'Session online' %}</a></li>
-        <li id="session-offline"><a href="{% url 'terminal:session-offline-list' %}">{% trans 'Session offline' %}</a></li>
-        <li id="command"><a href="{% url 'terminal:command-list' %}">{% trans 'Command' %}</a></li>
+        <li id="task"><a href="{% url 'ops:task-list' %}">{% trans 'Tasks' %}</a></li>
     </ul>
 </li>
 
-<li id="ops">
+<li id="terminal">
     <a>
-        <i class="fa fa-coffee"></i> <span class="nav-label">{% trans 'Job Center' %}</span><span class="fa arrow"></span>
+        <i class="fa fa-rocket"></i> <span class="nav-label">{% trans 'Terminal' %}</span><span class="fa arrow"></span>
     </a>
     <ul class="nav nav-second-level">
-        <li id="task"><a href="{% url 'ops:task-list' %}">{% trans 'Tasks' %}</a></li>
+        <li id="terminal"><a href="{% url 'terminal:terminal-list' %}">{% trans 'Terminal' %}</a></li>
+        <li id="session-online"><a href="{% url 'terminal:session-online-list' %}">{% trans 'Session online' %}</a></li>
+        <li id="session-offline"><a href="{% url 'terminal:session-offline-list' %}">{% trans 'Session offline' %}</a></li>
+        <li id="command"><a href="{% url 'terminal:command-list' %}">{% trans 'Command' %}</a></li>
     </ul>
 </li>
 
@@ -65,11 +65,11 @@
 {#        <li id="download"><a href="">{% trans 'File download' %}</a></li>#}
 {#    </ul>#}
 {#</li>#}
-{#<li id="">#}
-{#    <a href="">#}
-{#        <i class="fa fa-gears"></i> <span class="nav-label">{% trans 'Settings' %}</span><span class="label label-info pull-right"></span>#}
-{#    </a>#}
-{#</li>#}
+<li id="">
+    <a href="">
+        <i class="fa fa-gears"></i> <span class="nav-label">{% trans 'Settings' %}</span><span class="label label-info pull-right"></span>
+    </a>
+</li>
 <li class="special_link">
     <a href="http://www.jumpserver.org" target="_blank"><i class="fa fa-database"></i>
         <span class="nav-label">{% trans 'Visit us' %}</span>

apps/terminal/models.py

@@ -89,14 +89,14 @@ class Session(models.Model):
     id = models.UUIDField(default=uuid.uuid4, primary_key=True)
     user = models.CharField(max_length=128, verbose_name=_("User"))
     asset = models.CharField(max_length=1024, verbose_name=_("Asset"))
-    system_user = models.CharField(max_length=128, verbose_name=_("System User"))
+    system_user = models.CharField(max_length=128, verbose_name=_("System user"))
     login_from = models.CharField(max_length=2, choices=LOGIN_FROM_CHOICES, default="ST")
     is_finished = models.BooleanField(default=False)
     has_replay = models.BooleanField(default=False, verbose_name=_("Replay"))
     has_command = models.BooleanField(default=False, verbose_name=_("Command"))
     terminal = models.ForeignKey(Terminal, null=True, on_delete=models.CASCADE)
-    date_start = models.DateTimeField(verbose_name=_("Date Start"))
-    date_end = models.DateTimeField(verbose_name=_("Date End"), null=True)
+    date_start = models.DateTimeField(verbose_name=_("Date start"))
+    date_end = models.DateTimeField(verbose_name=_("Date end"), null=True)
 
     class Meta:
         db_table = "terminal_session"
@@ -113,7 +113,7 @@ class Task(models.Model):
 
     id = models.UUIDField(default=uuid.uuid4, primary_key=True)
     name = models.CharField(max_length=128, choices=NAME_CHOICES, verbose_name=_("Name"))
-    args = models.CharField(max_length=1024, verbose_name=_("Playbook Args"))
+    args = models.CharField(max_length=1024, verbose_name=_("Args"))
     terminal = models.ForeignKey(Terminal, null=True, on_delete=models.CASCADE)
     is_finished = models.BooleanField(default=False)
     date_created = models.DateTimeField(auto_now_add=True)