Merge pull request #3 from allianceauth/master

Sync

.gitignore

@@ -42,7 +42,6 @@ nosetests.xml
 coverage.xml
 
 # Translations
-*.mo
 *.pot
 
 # Django stuff:

allianceauth/__init__.py

@@ -1,7 +1,6 @@
 # This will make sure the app is always imported when
 # Django starts so that shared_task will use this app.
 
-__version__ = '2.0.1'
+__version__ = '2.0.4'
 NAME = 'Alliance Auth v%s' % __version__
 default_app_config = 'allianceauth.apps.AllianceAuthConfig'
-

allianceauth/corputils/auth_hooks.py

@@ -1,5 +1,5 @@
 from allianceauth.services.hooks import MenuItemHook, UrlHook
-
+from django.utils.translation import ugettext_lazy as _
 from allianceauth import hooks
 from allianceauth.corputils import urls
 
@@ -7,7 +7,7 @@ from allianceauth.corputils import urls
 class CorpStats(MenuItemHook):
     def __init__(self):
         MenuItemHook.__init__(self,
-                              'Corporation Stats',
+                              _('Corporation Stats'),
                               'fa fa-share-alt fa-fw',
                               'corputils:view',
                               navactive=['corputils:'])

allianceauth/corputils/models.py

@@ -12,6 +12,14 @@ from allianceauth.notifications import notify
 from allianceauth.corputils.managers import CorpStatsManager
 
 SWAGGER_SPEC_PATH = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'swagger.json')
+"""
+Swagger spec operations:
+
+get_characters_character_id
+get_corporations_corporation_id_members
+get_characters_names
+"""
+
 
 logger = logging.getLogger(__name__)
 

allianceauth/corputils/templates/corputils/corpstats.html

@@ -11,7 +11,7 @@
                                 {% if corpstats.corp.alliance %}{% else %}col-lg-offset-3{% endif %}"><img
                                 class="ra-avatar" src="{{ corpstats.corp.logo_url_128 }}"></td>
                         {% if corpstats.corp.alliance %}
-                            <td class="text-center col-lg-6"><img class="ra-avatar" src="{{ corpstats.alliance.logo_url_128 }}">
+                            <td class="text-center col-lg-6"><img class="ra-avatar" src="{{ corpstats.corp.alliance.logo_url_128 }}">
                             </td>
                         {% endif %}
                     </tr>

allianceauth/corputils/views.py

@@ -13,11 +13,17 @@ from allianceauth.eveonline.models import EveCharacter, EveCorporationInfo
 from .models import CorpStats
 
 SWAGGER_SPEC_PATH = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'swagger.json')
+"""
+Swagger spec operations:
+
+get_characters_character_id
+"""
 
 
 def access_corpstats_test(user):
     return user.has_perm('corputils.view_corp_corpstats') or user.has_perm(
-        'corputils.view_alliance_corpstats') or user.has_perm('corputils.view_state_corpstats')
+        'corputils.view_alliance_corpstats') or user.has_perm('corputils.view_state_corpstats') or user.has_perm(
+        'corputils.add_corpstats')
 
 
 @login_required
@@ -62,7 +68,7 @@ def corpstats_view(request, corp_id=None):
         corpstats = get_object_or_404(CorpStats, corp=corp)
 
     # get available models
-    available = CorpStats.objects.visible_to(request.user)
+    available = CorpStats.objects.visible_to(request.user).order_by('corp__corporation_name')
 
     # ensure we can see the requested model
     if corpstats and corpstats not in available:

allianceauth/eveonline/providers.py

@@ -4,6 +4,16 @@ import logging
 import os
 
 SWAGGER_SPEC_PATH = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'swagger.json')
+"""
+Swagger spec operations:
+
+get_alliances_alliance_id
+get_alliances_alliance_id_corporations
+get_corporations_corporation_id
+get_characters_character_id
+get_universe_types_type_id
+"""
+
 
 logger = logging.getLogger(__name__)
 

allianceauth/fleetactivitytracking/auth_hooks.py

@@ -1,12 +1,12 @@
 from . import urls
-
+from django.utils.translation import ugettext_lazy as _
 from allianceauth import hooks
 from allianceauth.services.hooks import MenuItemHook, UrlHook
 
 
 @hooks.register('menu_item_hook')
 def register_menu():
-    return MenuItemHook('Fleet Activity Tracking', 'fa fa-users fa-lightbulb-o fa-fw', 'fatlink:view',
+    return MenuItemHook(_('Fleet Activity Tracking'), 'fa fa-users fa-lightbulb-o fa-fw', 'fatlink:view',
                         navactive=['fatlink:'])
 
 

allianceauth/fleetactivitytracking/views.py

@@ -22,6 +22,16 @@ from allianceauth.eveonline.models import EveCharacter
 from allianceauth.eveonline.models import EveCorporationInfo
 
 SWAGGER_SPEC_PATH = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'swagger.json')
+"""
+Swagger spec operations:
+
+get_characters_character_id_location
+get_characters_character_id_ship
+get_universe_systems_system_id
+get_universe_stations_station_id
+get_universe_structures_structure_id
+"""
+
 
 logger = logging.getLogger(__name__)
 

allianceauth/hrapplications/auth_hooks.py

@@ -1,5 +1,5 @@
 from allianceauth.services.hooks import MenuItemHook, UrlHook
-
+from django.utils.translation import ugettext_lazy as _
 from allianceauth import hooks
 from allianceauth.hrapplications import urls
 
@@ -7,7 +7,7 @@ from allianceauth.hrapplications import urls
 class ApplicationsMenu(MenuItemHook):
     def __init__(self):
         MenuItemHook.__init__(self,
-                              'Applications',
+                              _('Applications'),
                               'fa fa-file-o fa-fw',
                               'hrapplications:index',
                               navactive=['hrapplications:'])

allianceauth/optimer/auth_hooks.py

@@ -1,12 +1,12 @@
 from allianceauth.services.hooks import MenuItemHook, UrlHook
-
+from django.utils.translation import ugettext_lazy as _
 from allianceauth import hooks
 from . import urls
 
 
 class OpTimerboardMenu(MenuItemHook):
     def __init__(self):
-        MenuItemHook.__init__(self, 'Fleet Operations',
+        MenuItemHook.__init__(self, _('Fleet Operations'),
                               'fa fa-exclamation  fa-fw',
                               'optimer:view',
                               navactive=['optimer:'])

allianceauth/optimer/templates/optimer/management.html

@@ -19,7 +19,8 @@
         <div class="col-lg-12 text-center row">
             <div class="label label-info text-left">
                 <b>{% trans "Current Eve Time:" %} </b>
-            </div><div class="label label-info text-left" id="current-time"></div>
+            </div>
+            <strong class="label label-info text-left" id="current-time"></strong>
             <br  />
         </div>
 
@@ -111,7 +112,7 @@
         }
 
         function updateClock() {
-            document.getElementById("current-time").innerHTML = "<b>" + moment.utc().format('LLLL') + "</b>";
+            document.getElementById("current-time").innerHTML = getCurrentEveTimeString();
         }
     </script>
 {% endblock content %}

allianceauth/project_template/project_name/settings/base.py

@@ -82,6 +82,7 @@ ugettext = lambda s: s
 LANGUAGES = (
     ('en', ugettext('English')),
     ('de', ugettext('German')),
+    ('es', ugettext('Spanish')),
 )
 
 TEMPLATES = [
@@ -193,6 +194,8 @@ LOGIN_TOKEN_SCOPES = ['publicData']
 # number of days email verification links are valid for
 ACCOUNT_ACTIVATION_DAYS = 1
 
+ESI_API_URL = 'https://esi.evetech.net/'
+
 LOGGING = {
     'version': 1,
     'disable_existing_loggers': False,

allianceauth/services/modules/discord/migrations/0002_service_permissions.py

@@ -57,5 +57,5 @@ class Migration(migrations.Migration):
             name='discorduser',
             options={'permissions': (('access_discord', 'Can access the Discord service'),)},
         ),
-        migrations.RunPython(migrate_service_enabled),
+        migrations.RunPython(migrate_service_enabled, migrations.RunPython.noop),
     ]

allianceauth/services/modules/discourse/migrations/0002_service_permissions.py

@@ -58,5 +58,5 @@ class Migration(migrations.Migration):
             name='discourseuser',
             options={'permissions': (('access_discourse', 'Can access the Discourse service'),)},
         ),
-        migrations.RunPython(migrate_service_enabled),
+        migrations.RunPython(migrate_service_enabled, migrations.RunPython.noop),
     ]

allianceauth/services/modules/discourse/templates/services/discourse/discourse_service_ctrl.html

@@ -1,8 +1,10 @@
 {% load i18n %}
 
-<td class="text-center">Discourse</td>
+<tr>
-<td class="text-center">{{ char.character_name }}</td>
+    <td class="text-center">Discourse</td>
-<td class="text-center"><a href="{{ DISCOURSE_URL }}">{{ DISCOURSE_URL }}</a></td>
+    <td class="text-center">{{ char.character_name }}</td>
-<td class="text-center">
+    <td class="text-center"><a href="{{ DISCOURSE_URL }}">{{ DISCOURSE_URL }}</a></td>
-    <a title="Go To Forums" class="btn btn-success" href="{{ DISCOURSE_URL }}"><span class="glyphicon glyphicon-arrow-right"></span></a>
+    <td class="text-center">
-</td>
+        <a title="Go To Forums" class="btn btn-success" href="{{ DISCOURSE_URL }}"><span class="glyphicon glyphicon-arrow-right"></span></a>
+    </td>
+</tr>

allianceauth/services/modules/ips4/migrations/0002_service_permissions.py

@@ -57,5 +57,5 @@ class Migration(migrations.Migration):
             name='ips4user',
             options={'permissions': (('access_ips4', 'Can access the IPS4 service'),)},
         ),
-        migrations.RunPython(migrate_service_enabled),
+        migrations.RunPython(migrate_service_enabled, migrations.RunPython.noop),
     ]

allianceauth/services/modules/market/migrations/0002_service_permissions.py

@@ -57,5 +57,5 @@ class Migration(migrations.Migration):
             name='marketuser',
             options={'permissions': (('access_market', 'Can access the Evernus Market service'),)},
         ),
-        migrations.RunPython(migrate_service_enabled),
+        migrations.RunPython(migrate_service_enabled, migrations.RunPython.noop),
     ]

allianceauth/services/modules/mumble/migrations/0006_service_permissions.py

@@ -57,5 +57,5 @@ class Migration(migrations.Migration):
             name='mumbleuser',
             options={'permissions': (('access_mumble', 'Can access the Mumble service'),)},
         ),
-        migrations.RunPython(migrate_service_enabled),
+        migrations.RunPython(migrate_service_enabled, migrations.RunPython.noop),
     ]

allianceauth/services/modules/openfire/migrations/0002_service_permissions.py

@@ -57,5 +57,5 @@ class Migration(migrations.Migration):
             name='openfireuser',
             options={'permissions': (('access_openfire', 'Can access the Openfire service'),)},
         ),
-        migrations.RunPython(migrate_service_enabled),
+        migrations.RunPython(migrate_service_enabled, migrations.RunPython.noop),
     ]

allianceauth/services/modules/phpbb3/migrations/0002_service_permissions.py

@@ -57,5 +57,5 @@ class Migration(migrations.Migration):
             name='phpbb3user',
             options={'permissions': (('access_phpbb3', 'Can access the phpBB3 service'),)},
         ),
-        migrations.RunPython(migrate_service_enabled),
+        migrations.RunPython(migrate_service_enabled, migrations.RunPython.noop),
     ]

allianceauth/services/modules/smf/migrations/0002_service_permissions.py

@@ -57,5 +57,5 @@ class Migration(migrations.Migration):
             name='smfuser',
             options={'permissions': (('access_smf', 'Can access the SMF service'),)},
         ),
-        migrations.RunPython(migrate_service_enabled),
+        migrations.RunPython(migrate_service_enabled, migrations.RunPython.noop),
     ]

allianceauth/services/modules/teamspeak3/manager.py

@@ -179,18 +179,19 @@ class Teamspeak3Manager:
         except:
             logger.exception("An unhandled exception has occured while syncing TS groups.")
 
-    def add_user(self, username):
+    def add_user(self, user, fmt_name):
-        username_clean = self.__santatize_username(username[:30])
+        username_clean = self.__santatize_username(fmt_name[:30])
         logger.debug("Adding user to TS3 server with cleaned username %s" % username_clean)
         server_groups = self._group_list()
 
-        if 'Member' not in server_groups:
+        state = user.profile.state.name
-            self._create_group('Member')
+        if state not in server_groups:
+             self._create_group(state)
 
-        alliance_group_id = self._group_id_by_name('Member')
+        state_group_id = self._group_id_by_name(state)
 
         try:
-            ret = self.server.send_command('tokenadd', {'tokentype': 0, 'tokenid1': alliance_group_id, 'tokenid2': 0,
+            ret = self.server.send_command('tokenadd', {'tokentype': 0, 'tokenid1': state_group_id, 'tokenid2': 0,
                                                         'tokendescription': username_clean,
                                                         'tokencustomset': "ident=sso_uid value=%s" % username_clean})
         except TeamspeakError as e:
@@ -244,10 +245,10 @@ class Teamspeak3Manager:
 
         return False
 
-    def generate_new_permissionkey(self, uid, username):
+    def generate_new_permissionkey(self, uid, user, username):
         logger.debug("Re-issuing permission key for user id %s" % uid)
         self.delete_user(uid)
-        return self.add_user(username)
+        return self.add_user(user, username)
 
     def update_groups(self, uid, ts_groups):
         logger.debug("Updating uid %s TS3 groups %s" % (uid, ts_groups))

allianceauth/services/modules/teamspeak3/migrations/0004_service_permissions.py

@@ -57,5 +57,5 @@ class Migration(migrations.Migration):
             name='teamspeak3user',
             options={'permissions': (('access_teamspeak3', 'Can access the Teamspeak3 service'),)},
         ),
-        migrations.RunPython(migrate_service_enabled),
+        migrations.RunPython(migrate_service_enabled, migrations.RunPython.noop),
     ]

allianceauth/services/modules/teamspeak3/views.py

@@ -22,7 +22,7 @@ def activate_teamspeak3(request):
     character = request.user.profile.main_character
     with Teamspeak3Manager() as ts3man:
         logger.debug("Adding TS3 user for user %s with main character %s" % (request.user, character))
-        result = ts3man.add_user(Teamspeak3Tasks.get_username(request.user))
+        result = ts3man.add_user(request.user, Teamspeak3Tasks.get_username(request.user))
 
     # if its empty we failed
     if result[0] is not "":
@@ -79,13 +79,12 @@ def reset_teamspeak3_perm(request):
     logger.debug("reset_teamspeak3_perm called by user %s" % request.user)
     if not Teamspeak3Tasks.has_account(request.user):
         return redirect("services:services")
-    character = request.user.profile.main_character
     logger.debug("Deleting TS3 user for user %s" % request.user)
     with Teamspeak3Manager() as ts3man:
         ts3man.delete_user(request.user.teamspeak3.uid)
 
-        logger.debug("Generating new permission key for user %s with main character %s" % (request.user, character))
+        logger.debug("Generating new permission key for user %s" % request.user)
-        result = ts3man.generate_new_permissionkey(request.user.teamspeak3.uid, character.character_name)
+        result = ts3man.generate_new_permissionkey(request.user.teamspeak3.uid, request.user, Teamspeak3Tasks.get_username(request.user))
 
     # if blank we failed
     if result[0] != "":

allianceauth/services/modules/xenforo/migrations/0002_service_permissions.py

@@ -57,5 +57,5 @@ class Migration(migrations.Migration):
             name='xenforouser',
             options={'permissions': (('access_xenforo', 'Can access the XenForo service'),)},
         ),
-        migrations.RunPython(migrate_service_enabled),
+        migrations.RunPython(migrate_service_enabled, migrations.RunPython.noop),
     ]

allianceauth/srp/auth_hooks.py

@@ -1,12 +1,12 @@
 from allianceauth.services.hooks import MenuItemHook, UrlHook
-
+from django.utils.translation import ugettext_lazy as _
 from allianceauth import hooks
 from . import urls
 
 
 class SrpMenu(MenuItemHook):
     def __init__(self):
-        MenuItemHook.__init__(self, 'Ship Replacement',
+        MenuItemHook.__init__(self, _('Ship Replacement'),
                               'fa fa-money fa-fw',
                               'srp:management',
                               navactive=['srp:'])

allianceauth/static/js/timers.js

@@ -8,8 +8,16 @@ function getDurationString(duration) {
     if (duration.years()) {
         out += duration.years() + 'y ';
     }
+    if (duration.months()) {
+        out += duration.months() + 'm ';
+    }
     if (duration.days()) {
         out += duration.days() + 'd ';
     }
     return out + duration.hours() + "h " + duration.minutes() + "m " + duration.seconds() + "s";
 }
+
+
+function getCurrentEveTimeString() {
+    return moment().utc().format('dddd LL HH:mm:ss')
+}

allianceauth/templates/allianceauth/help.html

@@ -1,11 +1,12 @@
 {% extends "allianceauth/base.html" %}
+{% load i18n %}
 
-{% block page_title %}Help{% endblock page_title %}
+{% block page_title %}{% trans "Help" %}{% endblock page_title %}
 
 {% block content %}
     <div class="col-lg-12">
 
-        <h1 class="page-header text-center">Help</h1>
+        <h1 class="page-header text-center">{%  trans "Help" %}</h1>
 
         <div class="container-fluid">
             <div class="embed-responsive embed-responsive-16by9">

allianceauth/templates/allianceauth/side-menu.html

@@ -7,12 +7,12 @@
             <li>
                 <a class="{% navactive request 'authentication:dashboard' %}"
                    href="{% url 'authentication:dashboard' %}">
-                    <i class="fa fa-dashboard fa-fw"></i>{% trans " Dashboard" %}
+                    <i class="fa fa-dashboard fa-fw"></i> {% trans "Dashboard" %}
                 </a>
             </li>
             <li>
                 <a class="{% navactive request 'groupmanagement:groups' %}" href="{% url 'groupmanagement:groups' %}">
-                    <i class="fa fa-cogs fa-fw fa-sitemap"></i>{% trans " Groups" %}
+                    <i class="fa fa-cogs fa-fw fa-sitemap"></i> {% trans "Groups" %}
                 </a>
             </li>
 
@@ -20,7 +20,7 @@
                 <li>
                     <a class="{% navactive request 'groupmanagement:management groupmanagement:membership groupmanagement:membership_list' %}"
                        href="{% url 'groupmanagement:management' %}">
-                        <i class="fa fa-lock fa-sitemap fa-fw"></i>{% trans " Group Management" %}
+                        <i class="fa fa-lock fa-sitemap fa-fw"></i> {% trans "Group Management" %}
                     </a>
                 </li>
             {% endif %}
@@ -30,7 +30,7 @@
             <li>
                 <a class="{% navactive request 'authentication:help' %}"
                    href="{% url 'authentication:help' %}">
-                    <i class="fa fa-question fa-fw"></i>{% trans " Help" %}
+                    <i class="fa fa-question fa-fw"></i> {% trans "Help" %}
                 </a>
             </li>
         </ul>

allianceauth/templates/bundles/moment-js.html

@@ -1,4 +1,4 @@
-<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.17.1/moment.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.22.1/moment.min.js"></script>
 {% if locale and LANGUAGE_CODE != 'en' %}
-<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.17.1/locale/{{ LANGUAGE_CODE }}.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.22.1/locale/{{ LANGUAGE_CODE }}.js"></script>
 {% endif %}

allianceauth/timerboard/templates/timerboard/view.html

@@ -18,7 +18,8 @@
         <div class="col-lg-12 text-center">
             <div class="label label-info text-left">
                 <b>{% trans "Current Eve Time:" %} </b>
-            </div><div class="label label-info text-left" id="current-time"></div>
+            </div>
+            <strong class="label label-info text-left" id="current-time"></strong>
         </div>
         {% if corp_timers %}
             <h4><b>{% trans "Corp Timers" %}</b></h4>
@@ -555,7 +556,7 @@
         }
 
         function updateClock() {
-            document.getElementById("current-time").innerHTML = "<b>" + moment().format('LLLL') + "</b>";
+            document.getElementById("current-time").innerHTML = getCurrentEveTimeString();
         }
     </script>
 {% endblock content %}