Some small improvement

bazarr/get_argv.py

@@ -2,7 +2,7 @@ import os
 import sys
 import getopt
 
-config_dir = os.path.join(os.path.dirname(__file__), '../data/')
+config_dir = os.path.join(os.path.dirname(os.path.dirname(__file__)), 'data')
 no_update = False
 
 try:

bazarr/main.py

@@ -1463,8 +1463,8 @@ def system():
 
     return template('system', __file__=__file__, bazarr_version=bazarr_version,
                     sonarr_version=sonarr_version.json()['version'], radarr_version=radarr_version.json()['version'],
-                    operation_system=platform.platform(), python_version=platform.python_version(),
-                    config_dir=config_dir, bazarr_dir=os.getcwd(),
+                    operating_system=platform.platform(), python_version=platform.python_version(),
+                    config_dir=config_dir, bazarr_dir=os.path.normcase(os.getcwd()),
                     base_url=base_url, task_list=task_list, row_count=row_count, max_page=max_page, page_size=page_size,
                     releases=releases, current_port=port)
 

views/system.tpl

@@ -126,7 +126,7 @@
                     <div class="ui grid">
                         <div class="middle aligned row">
                             <div class="right aligned four wide column">
-                                <label>Version</label>
+                                <label>Bazarr version</label>
                             </div>
                             <div class="five wide column">
                                 <div class='field'>
@@ -136,47 +136,47 @@
                                 </div>
                             </div>
                         </div>
+                        % from get_settings import get_general_settings
+                        % if get_general_settings()[12]:
                         <div class="middle aligned row">
                             <div class="right aligned four wide column">
-                                <label>Operation system</label>
+                                <label>Sonarr version</label>
                             </div>
                             <div class="five wide column">
                                 <div class='field'>
                                     <div class="ui fluid input">
-                                        {{operation_system}}
+                                        {{sonarr_version}}
                                     </div>
                                 </div>
                             </div>
                         </div>
-                        % from get_settings import get_general_settings
-                        % if get_general_settings()[12]:
+                        % end
+                        % if get_general_settings()[13]:
                         <div class="middle aligned row">
                             <div class="right aligned four wide column">
-                                <label>Sonarr version</label>
+                                <label>Radarr version</label>
                             </div>
                             <div class="five wide column">
                                 <div class='field'>
                                     <div class="ui fluid input">
-                                        {{sonarr_version}}
+                                        {{radarr_version}}
                                     </div>
                                 </div>
                             </div>
                         </div>
                         % end
-                        % if get_general_settings()[13]:
                         <div class="middle aligned row">
                             <div class="right aligned four wide column">
-                                <label>Radarr version</label>
+                                <label>Operating system</label>
                             </div>
                             <div class="five wide column">
                                 <div class='field'>
                                     <div class="ui fluid input">
-                                        {{radarr_version}}
+                                        {{operating_system}}
                                     </div>
                                 </div>
                             </div>
                         </div>
-                        % end
                         <div class="middle aligned row">
                             <div class="right aligned four wide column">
                                 <label>Python version</label>
@@ -191,24 +191,24 @@
                         </div>
                         <div class="middle aligned row">
                             <div class="right aligned four wide column">
-                                <label>Bazarr config dir</label>
+                                <label>Bazarr directory</label>
                             </div>
                             <div class="five wide column">
                                 <div class='field'>
                                     <div class="ui fluid input">
-                                        {{config_dir}}
+                                        {{bazarr_dir}}
                                     </div>
                                 </div>
                             </div>
                         </div>
                         <div class="middle aligned row">
                             <div class="right aligned four wide column">
-                                <label>Bazarr directory</label>
+                                <label>Bazarr config directory</label>
                             </div>
                             <div class="five wide column">
                                 <div class='field'>
                                     <div class="ui fluid input">
-                                        {{bazarr_dir}}
+                                        {{config_dir}}
                                     </div>
                                 </div>
                             </div>