BryanDavis has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/364134 )
Change subject: Update to use Toolforge branding
......................................................................
Update to use Toolforge branding
Change "Tool Labs" to "Toolforge" in all locations. Also use Wikimedia
VPS or Wikimedia Cloud Services in appropriate places instead of "Labs".
Bug: T168480
Change-Id: Ifcc9bfc9b8e5427b2d2576660ec1f1044a5bac1a
---
M README.rst
M setup.py
M striker/goals/signals/handlers.py
M striker/templates/base.html
M striker/templates/goals/ACCOUNT_SSH.html
M striker/templates/goals/TOOL_GIT.html
M striker/templates/goals/TOOL_MEMBER.html
M striker/templates/index.html
M striker/templates/index/anon.html
M striker/templates/labsauth/base.html
M striker/templates/profile/settings/accounts/ldap.html
M striker/templates/register/base.html
M striker/templates/register/confirm.html
M striker/templates/register/email.html
M striker/templates/register/shell.html
M striker/templates/tools/create.html
M striker/templates/tools/index.html
M striker/templates/tools/membership.html
M striker/templates/tools/membership/apply.html
M striker/templates/tools/membership/status.html
M striker/tools/forms.py
M striker/tools/models.py
M striker/tools/views.py
23 files changed, 36 insertions(+), 35 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/labs/striker
refs/changes/34/364134/1
diff --git a/README.rst b/README.rst
index f055a9a..4e93068 100644
--- a/README.rst
+++ b/README.rst
@@ -1,9 +1,9 @@
=======================================
-Striker (Wikimedia Tool Labs Dashboard)
+Striker (Wikimedia Toolforge Dashboard)
=======================================
**Striker** is a Django-based project that provides services needed by
-Wikimedia Tool Labs developers. A blacksmith's striker is an assistant whose
+Wikimedia Toolforge developers. A blacksmith's striker is an assistant whose
job is to swing a large sledgehammer in forging operations at the direction of
the blacksmith.
diff --git a/setup.py b/setup.py
index bb333ca..fd2f0b8 100755
--- a/setup.py
+++ b/setup.py
@@ -23,7 +23,7 @@
setup(
name='Striker',
version='0.1',
- description='Wikimedia Tool Labs Dashboard',
+ description='Wikimedia Toolforge Dashboard',
author='Wikimedia Foundation',
license='GPLv3+',
url='https://tools.wmflabs.org/',
diff --git a/striker/goals/signals/handlers.py
b/striker/goals/signals/handlers.py
index 6da3f89..b42777a 100644
--- a/striker/goals/signals/handlers.py
+++ b/striker/goals/signals/handlers.py
@@ -52,7 +52,7 @@
def check_goal_member(user):
- """Check LabsUser model for Tool Labs membership."""
+ """Check LabsUser model for Toolforge membership."""
groups = user.groups.values_list('name', flat=True)
if settings.TOOLS_TOOL_LABS_GROUP_NAME in groups:
user.milestones.recordMilestone(GOALS['TOOL_MEMBER'])
diff --git a/striker/templates/base.html b/striker/templates/base.html
index fee0fab..e6dd50e 100644
--- a/striker/templates/base.html
+++ b/striker/templates/base.html
@@ -33,7 +33,7 @@
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="{% url 'index' %}">
- <img alt="{% trans "Tool Labs admin console" %}" src="{% static
"img/logo.png" %}">
+ <img alt="{% trans "Toolforge admin console" %}" src="{% static
"img/logo.png" %}">
</a>
</div>
<div id="navbar" class="collapse navbar-collapse">
diff --git a/striker/templates/goals/ACCOUNT_SSH.html
b/striker/templates/goals/ACCOUNT_SSH.html
index cff77b4..60126c3 100644
--- a/striker/templates/goals/ACCOUNT_SSH.html
+++ b/striker/templates/goals/ACCOUNT_SSH.html
@@ -4,7 +4,7 @@
{% block title %}{% trans "Add your SSH public key" %}{% endblock %}
{% block body %}
-<p>{% blocktrans %}Labs and Tool Labs servers are accessed using <a
href="https://en.wikipedia.org/wiki/Secure_Shell";>SSH</a>. You need to upload
an ssh public key to enable your SSH access.{% endblocktrans %}</p>
+<p>{% blocktrans %}Wikimedia VPS and Toolforge servers are accessed using <a
href="https://en.wikipedia.org/wiki/Secure_Shell";>SSH</a>. You need to upload
an ssh public key to enable your SSH access.{% endblocktrans %}</p>
<p class="text-muted">{% blocktrans %}See <a
href="https://wikitech.wikimedia.org/wiki/Help:Tool_Labs/Access#Generating_and_uploading_an_SSH_key";>the
help documentation</a> for more information on how to generate and upload your
public SSH key.{% endblocktrans %}</p>
<p><a href="{% url 'profile:ssh_keys' %}" class="btn btn-default">{% trans
"Add public SSH key" %}</a></p>
{% endblock %}
diff --git a/striker/templates/goals/TOOL_GIT.html
b/striker/templates/goals/TOOL_GIT.html
index 4538eb6..2f38e15 100644
--- a/striker/templates/goals/TOOL_GIT.html
+++ b/striker/templates/goals/TOOL_GIT.html
@@ -4,6 +4,6 @@
{% block title %}{% trans "Add a git repository to a tool" %}{% endblock %}
{% block body %}
-<p>{% blocktrans %}Tool Labs now offers hosting for git repositories using
Phabricator and Diffusion. You can add a Diffusion repository to any tool you
maintain.{% endblocktrans %}</p>
+<p>{% blocktrans %}Toolforge offers hosting for git repositories using
Phabricator and Diffusion. You can add a Diffusion repository to any tool you
maintain.{% endblocktrans %}</p>
<p><a href="{% url 'tools:index' %}" class="btn btn-default">{% trans "View my
tools" %}</a></p>
{% endblock %}
diff --git a/striker/templates/goals/TOOL_MEMBER.html
b/striker/templates/goals/TOOL_MEMBER.html
index f4798e5..7a56286 100644
--- a/striker/templates/goals/TOOL_MEMBER.html
+++ b/striker/templates/goals/TOOL_MEMBER.html
@@ -1,9 +1,9 @@
{% extends "goals/base.html" %}
{% load i18n %}
-{% block title %}{% trans "Become a Tool Labs member" %}{% endblock %}
+{% block title %}{% trans "Become a Toolforge member" %}{% endblock %}
{% block body %}
-<p>{% blocktrans %}Request membership in the Tool Labs project so you can
create your own tool and help maintain existing tools.{% endblocktrans %}</p>
+<p>{% blocktrans %}Request membership in the Toolforge project so you can
create your own tool and help maintain existing tools.{% endblocktrans %}</p>
<p><a href="{% url 'tools:membership_apply' %}" class="btn btn-default">{%
trans "Join now" %}</a></p>
{% endblock %}
diff --git a/striker/templates/index.html b/striker/templates/index.html
index 9255305..30643b7 100644
--- a/striker/templates/index.html
+++ b/striker/templates/index.html
@@ -2,7 +2,7 @@
{% load bootstrap3 %}
{% load i18n %}
-{% block title %}{% trans "Tool Labs admin console" %}{% endblock %}
+{% block title %}{% trans "Toolforge admin console" %}{% endblock %}
{% block content %}
<div class="container-fluid">
{% if user.is_authenticated %}
diff --git a/striker/templates/index/anon.html
b/striker/templates/index/anon.html
index 16aa769..b3af646 100644
--- a/striker/templates/index/anon.html
+++ b/striker/templates/index/anon.html
@@ -5,7 +5,7 @@
<div class="jumbotron">
<h1>{% trans "Welcome!" %}</h1>
{% blocktrans with tl_url='https://tools.wmflabs.org/' %}
- <p><strong>Tool Labs admin console</strong> helps <a href="{{ tl_url
}}">Wikimedia Tool Labs</a> users manage their tools.</p>
+ <p><strong>Toolforge admin console</strong> helps <a href="{{ tl_url
}}">Wikimedia Toolforge</a> users manage their tools.</p>
{% endblocktrans %}
{% url 'labsauth:login' as login_url %}
{% blocktrans with login_url=login_url %}
diff --git a/striker/templates/labsauth/base.html
b/striker/templates/labsauth/base.html
index 809c957..146173c 100644
--- a/striker/templates/labsauth/base.html
+++ b/striker/templates/labsauth/base.html
@@ -12,8 +12,8 @@
<div class="panel panel-default login-panel">
<div class="panel-heading">
<h3 class="panel-title">
- <img alt="{% trans "Tool Labs admin console" %}" src="{% static
"img/logo.png" %}">
- {% trans "Tool Labs admin console" %}
+ <img alt="{% trans "Toolforge admin console" %}" src="{% static
"img/logo.png" %}">
+ {% trans "Toolforge admin console" %}
</h3>
</div>
{% block panelbody %}{% endblock %}
diff --git a/striker/templates/profile/settings/accounts/ldap.html
b/striker/templates/profile/settings/accounts/ldap.html
index a51373f..04003ad 100644
--- a/striker/templates/profile/settings/accounts/ldap.html
+++ b/striker/templates/profile/settings/accounts/ldap.html
@@ -3,7 +3,7 @@
<div class="panel panel-default">
<div class="panel-heading">
- <h3 class="panel-title">{% fa_icon "user-circle" "lg" "fw"
aria_hidden="true" %} {% trans "Wikitech/Labs/Gerrit LDAP account" %}</h3>
+ <h3 class="panel-title">{% fa_icon "user-circle" "lg" "fw"
aria_hidden="true" %} {% trans "Wikitech/Wikimedia Cloud Services/Gerrit LDAP
account" %}</h3>
</div>
<div class="panel-body">
<dl class="dl-horizontal margin-zero">
diff --git a/striker/templates/register/base.html
b/striker/templates/register/base.html
index ce256a6..ecc3006 100644
--- a/striker/templates/register/base.html
+++ b/striker/templates/register/base.html
@@ -62,10 +62,10 @@
{% block left-col %}
<div class="panel panel-default">
<div class="panel-heading">
- {% bootstrap_icon "info-sign" %} {% trans "About Tool Labs accounts"
%}
+ {% bootstrap_icon "info-sign" %} {% trans "About Toolforge accounts"
%}
</div>
<div class="panel-body">
- {% blocktrans %}<strong>Tool Labs</strong> shares an account system
with many other technical tools used by Wikimedians. The <a
href="https://en.wikipedia.org/wiki/Lightweight_Directory_Access_Protocol/";>LDAP</a>
user account used here also works with <a
href="https://wikitech.wikimedia.org/";>Wikitech</a>, <a
href="https://gerrit.wikimedia.org/";>Gerrit</a>, <a
href="https://phabricator.wikimedia.org/";>Phabricator</a>, and other tools
designed to help our technical contributors build and maintain software. These
accounts are separate from the <a
href="https://meta.wikimedia.org/wiki/Help:Unified_login";>Wikimedia unified
accounts</a> that are used by most <a
href="https://meta.wikimedia.org/wiki/Wikimedia_wikis";>Wikimedia wikis</a>.{%
endblocktrans %}
+ {% blocktrans %}<strong>Toolforge</strong> shares an account system
with many other technical tools used by Wikimedians. The <a
href="https://en.wikipedia.org/wiki/Lightweight_Directory_Access_Protocol/";>LDAP</a>
user account used here also works with <a
href="https://wikitech.wikimedia.org/";>Wikitech</a>, <a
href="https://gerrit.wikimedia.org/";>Gerrit</a>, <a
href="https://phabricator.wikimedia.org/";>Phabricator</a>, and other tools
designed to help our technical contributors build and maintain software. These
accounts are separate from the <a
href="https://meta.wikimedia.org/wiki/Help:Unified_login";>Wikimedia unified
accounts</a> that are used by most <a
href="https://meta.wikimedia.org/wiki/Wikimedia_wikis";>Wikimedia wikis</a>.{%
endblocktrans %}
</div>
</div>
{% endblock %}
diff --git a/striker/templates/register/confirm.html
b/striker/templates/register/confirm.html
index d945f7e..93bdcd4 100644
--- a/striker/templates/register/confirm.html
+++ b/striker/templates/register/confirm.html
@@ -10,7 +10,7 @@
<div class="panel panel-warning">
<div class="panel-body panel-body-warning">
{% bootstrap_icon "exclamation-sign" %}
- {% blocktrans with
TOU='https://wikitech.wikimedia.org/wiki/Wikitech:Labs_Terms_of_use'
CoC='https://www.mediawiki.org/wiki/Code_of_Conduct'%}By creating an account in
this project and/or using other wmflabs.org Services, you agree to comply with
the <a href="{{ TOU }}">Terms of Use</a> for wmflabs.org. In particular, you
agree not to collect, store, or share private data or personally identifiable
information, such as user names, passwords, or IP addresses from the
individuals using your Labs Project, except when complying with the conditions
listed in the <a href="{{ TOU }}">Terms of Use</a>. You further agree to abide
by the <a href="{{ CoC }}">Code of Conduct for Wikimedia technical
spaces</a>.{% endblocktrans %}
+ {% blocktrans with
TOU='https://wikitech.wikimedia.org/wiki/Wikitech:Labs_Terms_of_use'
CoC='https://www.mediawiki.org/wiki/Code_of_Conduct'%}By creating an account in
this project and/or using other wmflabs.org Services, you agree to comply with
the <a href="{{ TOU }}">Terms of Use</a> for wmflabs.org. In particular, you
agree not to collect, store, or share private data or personally identifiable
information, such as user names, passwords, or IP addresses from the
individuals using your Wikimedia VPS Project, except when complying with the
conditions listed in the <a href="{{ TOU }}">Terms of Use</a>. You further
agree to abide by the <a href="{{ CoC }}">Code of Conduct for Wikimedia
technical spaces</a>.{% endblocktrans %}
</div>
</div>
<div class="panel-body">
diff --git a/striker/templates/register/email.html
b/striker/templates/register/email.html
index 28db8f9..8a2f67c 100644
--- a/striker/templates/register/email.html
+++ b/striker/templates/register/email.html
@@ -8,7 +8,7 @@
<h3 class="panel-title">{% bootstrap_icon "envelope" %} {% trans "Add your
email address" %}</h3>
</div>
<div class="panel-body">
- <p>{% blocktrans %}A valid email address is required to use Tool Labs.
Tool Labs administrators may need to contact you concerning your tools and
other processes running in Labs. This email address <strong>will</strong> be
publically visible.{% endblocktrans %}</p>
+ <p>{% blocktrans %}A valid email address is required to use Toolforge.
Toolforge administrators may need to contact you concerning your tools and
other processes running in Wikimedia VPS. This email address
<strong>will</strong> be publically visible.{% endblocktrans %}</p>
<form method="post" action="" class="form parsley">
{% csrf_token %}
{{ wizard.management_form }}
diff --git a/striker/templates/register/shell.html
b/striker/templates/register/shell.html
index 8710da7..44018b7 100644
--- a/striker/templates/register/shell.html
+++ b/striker/templates/register/shell.html
@@ -8,8 +8,9 @@
<h3 class="panel-title">{% bootstrap_icon "hdd" %} {% trans "Choose your
UNIX shell username" %}</h3>
</div>
<div class="panel-body">
- <p>{% blocktrans %}Your shell username will be used when logging into Tool
- Labs and other Labs hosts using <a
href="https://en.wikipedia.org/wiki/Secure_Shell";>ssh</a>. This name is
typically shorter than a wiki username. It must start with <code>a-z</code>,
and can only contain lowercase <code>a-z</code>, <code>0-9</code> and
<code>-</code> characters.{% endblocktrans %}</p>
+ <p>{% blocktrans with ssh="https://en.wikipedia.org/wiki/Secure_Shell"; %}
+ Your shell username will be used when logging into Toolforge and other
Wikimedia VPS hosts using <a href="{{ ssh }}">ssh</a>. This name is typically
shorter than a wiki username. It must start with <code>a-z</code>, and can only
contain lowercase <code>a-z</code>, <code>0-9</code> and <code>-</code>
characters.
+ {% endblocktrans %}</p>
<form method="post" action="" class="form parsley">
{% csrf_token %}
{{ wizard.management_form }}
diff --git a/striker/templates/tools/create.html
b/striker/templates/tools/create.html
index f26cdc7..faf9764 100644
--- a/striker/templates/tools/create.html
+++ b/striker/templates/tools/create.html
@@ -21,7 +21,7 @@
<h3 class="panel-title">{% bootstrap_icon "wrench" %} {% trans "Create
Tool account" %}</h3>
</div>
<div class="panel-body">
- <p>{% blocktrans with
help="https://wikitech.wikimedia.org/wiki/Help:Tool_Labs#What_is_a_Tool_account.3F";
%}A Tool account is the "user" associated with a Tool on Tool Labs. The
account allows multiple Tool Labs users to collaborate on creating and
maintaining a tool. Maintainers may have more than one tool account, and tool
accounts may have more than one maintainer. See <a href="{{ help }}">help on
wikitech</a> for more information.{% endblocktrans %}</p>
+ <p>{% blocktrans with
help="https://wikitech.wikimedia.org/wiki/Help:Tool_Labs#What_is_a_Tool_account.3F";
%}A Tool account is the "user" associated with a Tool on Toolforge. The
account allows multiple Toolforge users to collaborate on creating and
maintaining a tool. Maintainers may have more than one tool account, and tool
accounts may have more than one maintainer. See <a href="{{ help }}">help on
wikitech</a> for more information.{% endblocktrans %}</p>
<form method="post" action="{% url 'tools:tool_create' %}" class="form
parsley">
{% csrf_token %}
{% bootstrap_form form %}
diff --git a/striker/templates/tools/index.html
b/striker/templates/tools/index.html
index a44db7d..7ee9bfb 100644
--- a/striker/templates/tools/index.html
+++ b/striker/templates/tools/index.html
@@ -21,7 +21,7 @@
<div class="list-group-item">{% blocktrans %}Your account is not
associated with any tools.{% endblocktrans %}</div>
{% else %}
<div class="list-group-item">
- <p>{% blocktrans %}Request membership in the Tool Labs project so
you can create your own tool and help maintain existing tools.{% endblocktrans
%}</p>
+ <p>{% blocktrans %}Request membership in the Toolforge project so
you can create your own tool and help maintain existing tools.{% endblocktrans
%}</p>
<p><a href="{% url 'tools:membership_apply' %}" class="btn
btn-default">{% trans "Join now" %}</a></p>
</div>
{% endif %}
diff --git a/striker/templates/tools/membership.html
b/striker/templates/tools/membership.html
index a9083a9..63d5522 100644
--- a/striker/templates/tools/membership.html
+++ b/striker/templates/tools/membership.html
@@ -2,7 +2,7 @@
{% load bootstrap3 %}
{% load i18n %}
-{% block title %}{% trans "Tool Labs membership requests" %}{% endblock %}
+{% block title %}{% trans "Toolforge membership requests" %}{% endblock %}
{% block pre_content %}
<ol class="breadcrumb">
diff --git a/striker/templates/tools/membership/apply.html
b/striker/templates/tools/membership/apply.html
index a0083a0..7ed3c3c 100644
--- a/striker/templates/tools/membership/apply.html
+++ b/striker/templates/tools/membership/apply.html
@@ -2,12 +2,12 @@
{% load bootstrap3 %}
{% load i18n %}
-{% block title %}{% trans "Join Tool Labs" %}{% endblock %}
+{% block title %}{% trans "Join Toolforge" %}{% endblock %}
{% block pre_content %}
<ol class="breadcrumb">
<li><a href="{% url 'tools:index' %}">{% trans "Tools" %}</a></li>
- <li class="active">{% trans "Join Tool Labs" %}</li>
+ <li class="active">{% trans "Join Toolforge" %}</li>
</ol>
{{ block.super }}
{% endblock %}
@@ -17,7 +17,7 @@
<div class="row">
<div class="panel panel-default">
<div class="panel-heading">
- <h3 class="panel-title">{% trans "Request Tool Labs project
membership" %}</h3>
+ <h3 class="panel-title">{% trans "Request Toolforge project
membership" %}</h3>
</div>
<div class="panel-body">
<form method="post" action="{% url 'tools:membership_apply' %}"
class="form">
diff --git a/striker/templates/tools/membership/status.html
b/striker/templates/tools/membership/status.html
index 04f7a62..412f6cf 100644
--- a/striker/templates/tools/membership/status.html
+++ b/striker/templates/tools/membership/status.html
@@ -2,7 +2,7 @@
{% load bootstrap3 %}
{% load i18n %}
-{% block title %}{% trans "Tool Labs membership request" %}{% endblock %}
+{% block title %}{% trans "Toolforge membership request" %}{% endblock %}
{% block pre_content %}
<ol class="breadcrumb">
diff --git a/striker/tools/forms.py b/striker/tools/forms.py
index 89bfe8b..e950eed 100644
--- a/striker/tools/forms.py
+++ b/striker/tools/forms.py
@@ -74,8 +74,8 @@
'reason': forms.Textarea(
attrs={
'placeholder': _(
- 'Briefly explain how you will use Tool '
- 'Labs to benefit the Wikimedia movement.'
+ 'Briefly explain how you will use Toolforge '
+ 'to benefit the Wikimedia movement.'
),
'rows': 5,
},
diff --git a/striker/tools/models.py b/striker/tools/models.py
index d656449..0015b49 100644
--- a/striker/tools/models.py
+++ b/striker/tools/models.py
@@ -202,7 +202,7 @@
@reversion.register()
class ToolInfo(models.Model):
- """Metadata about a Tool hosted on Tool Labs.
+ """Metadata about a Tool hosted on Toolforge.
A single Tool may have 1-to-N metadata records.
"""
diff --git a/striker/tools/views.py b/striker/tools/views.py
index 86dc7f9..c80d2d2 100644
--- a/striker/tools/views.py
+++ b/striker/tools/views.py
@@ -63,8 +63,8 @@
from striker.tools.models import ToolInfoTag
-WELCOME_MSG = "== Welcome to Tool Labs! ==\n{{subst:ToolsGranted}}"
-WELCOME_SUMMARY = 'Welcome to Tool Labs!'
+WELCOME_MSG = "== Welcome to Toolforge! ==\n{{subst:ToolsGranted}}"
+WELCOME_SUMMARY = 'Welcome to Toolforge!'
logger = logging.getLogger(__name__)
phab = phabricator.Client.default_client()
@@ -555,7 +555,7 @@
"""Request membership in the Tools project."""
if project_member(req.user):
messages.error(
- req, _('You are already a member of Tool Labs'))
+ req, _('You are already a member of Toolforge'))
return see_other(urlresolvers.reverse('tools:index'))
pending = AccessRequest.objects.filter(
@@ -588,7 +588,7 @@
],
)
messages.info(
- req, _("Tool Labs membership request submitted"))
+ req, _("Toolforge membership request submitted"))
return shortcuts.redirect(urlresolvers.reverse('tools:index'))
except DatabaseError:
logger.exception('AccessRequest.save failed')
@@ -673,7 +673,7 @@
)
messages.info(
- req, _("Tool Labs membership request updated"))
+ req, _("Toolforge membership request updated"))
return shortcuts.redirect(
urlresolvers.reverse(
'tools:membership_status', args=[request.id]))
--
To view, visit https://gerrit.wikimedia.org/r/364134
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifcc9bfc9b8e5427b2d2576660ec1f1044a5bac1a
Gerrit-PatchSet: 1
Gerrit-Project: labs/striker
Gerrit-Branch: master
Gerrit-Owner: BryanDavis <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
