diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 5a1d96ccb..251983e88 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -92,5 +92,5 @@ jobs: filename: covbadge.json label: coverage message: ${{ env.TOTAL_COV }}% - color: "#3aa57c" + color: "#2185d0" if: env.TOTAL_COV && github.ref == 'refs/heads/development' diff --git a/doc/_themes/pretalx_theme/static/css/pretalx.css b/doc/_themes/pretalx_theme/static/css/pretalx.css index aabc803d8..221afdb38 100644 --- a/doc/_themes/pretalx_theme/static/css/pretalx.css +++ b/doc/_themes/pretalx_theme/static/css/pretalx.css @@ -135,7 +135,7 @@ main { header { height: 70px; - background-color: #3aa57c; + background-color: #2185d0; width: 100%; position: fixed; z-index: 100; @@ -194,8 +194,8 @@ header #related .dropdown .dropdown-body .dropdown-item a { color: #2c3e50; } header #related .dropdown .dropdown-body .dropdown-item a:hover { - color: #3aa57c; - border-bottom: 2px solid #3aa57c; + color: #2185d0; + border-bottom: 2px solid #2185d0; } header #related .dropdown .dropdown-title { color: white; @@ -286,7 +286,7 @@ footer a.fa { } a, a:hover { - color: #3aa57c; + color: #2185d0; font-weight: bold; text-decoration: none; cursor: pointer @@ -453,11 +453,11 @@ legend { background: #4697c9 } .hint, .important, .tip { - border: 1px solid #3aa57c; + border: 1px solid #2185d0; background: white; } .hint .admonition-title, .important .admonition-title, .tip .admonition-title { - background: #3aa57c + background: #2185d0 } .note p:last-child, .attention p:last-child, .caution p:last-child, .danger p:last-child, .error p:last-child, .hint p:last-child, .important p:last-child, .tip p:last-child, .warning p:last-child, .seealso p:last-child, .admonition-todo p:last-child { margin-bottom: 0 @@ -749,7 +749,7 @@ div[class^='highlight'] pre { color: #7f8c8d; } #toctree a:hover { - border-bottom: 2px #3aa57c solid; + border-bottom: 2px #2185d0 solid; } #toctree .toctree-l1 > a { color: #2c3e50; @@ -765,11 +765,11 @@ div[class^='highlight'] pre { padding-left: 1.5em; } #toctree .toctree-l2.current > a, #toctree .toctree-l3.current > a, #toctree .toctree-l4.current > a { - color: #3aa57c; + color: #2185d0; font-weight: bold; } #toctree .toctree-l2.current a, #toctree .toctree-l3.current a, #toctree .toctree-l4.current a { - color: #3aa57c; + color: #2185d0; } #toctree code { border: none; @@ -980,7 +980,7 @@ dl:not(.docutils) .property { } .sectionbox .fa { font-size: 48px; - color: #3aa57c; + color: #2185d0; margin-right: 8px; } .sectionbox .content { @@ -990,7 +990,7 @@ dl:not(.docutils) .property { margin-top: 10px; } .sectionbox .heading { - color: #3aa57c; + color: #2185d0; font-size: 20px; } .sectionbox .text p { diff --git a/pyproject.toml b/pyproject.toml index dab20fdde..47b300729 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -103,11 +103,11 @@ build-backend = "setuptools.build_meta" requires = ["setuptools", "wheel"] [project.urls] -Homepage = "https://pretalx.com" -Documentation = "https://docs.pretalx.org" -Repository = "https://github.com/pretalx/pretalx" -Changelog = "https://docs.pretalx.org/changelog/" -Issues = "https://github.com/pretalx/pretalx/issues" +Homepage = "https://eventyay.com" +Documentation = "https://docs.eventyay.org" +Repository = "https://github.com/fossasia/eventyay-talk" +Changelog = "https://docs.eventyay.org/changelog/" +Issues = "https://github.com/fossasia/eventyay-talk/issues" [tool.setuptools] include-package-data = true diff --git a/src/pretalx/api/templates/rest_framework/api.html b/src/pretalx/api/templates/rest_framework/api.html index 7e2c02426..7677b1251 100644 --- a/src/pretalx/api/templates/rest_framework/api.html +++ b/src/pretalx/api/templates/rest_framework/api.html @@ -14,8 +14,8 @@ {% endblock bootstrap_theme %} {% block branding %} - - {% translate - pretalx API + + {% translate + eventyay API {% endblock branding %} diff --git a/src/pretalx/common/management/commands/create_test_event.py b/src/pretalx/common/management/commands/create_test_event.py index 7c732e835..0218cd68a 100644 --- a/src/pretalx/common/management/commands/create_test_event.py +++ b/src/pretalx/common/management/commands/create_test_event.py @@ -72,7 +72,7 @@ def build_event(self, end_stage, slug): self.catch_phrase = self.fake.catch_phrase() intro = f"We provide a {self.catch_phrase.lower()} to {self.bs}." disclaimer = """This is an automatically generated event to test and showcase pretalx features. -Feel free to look around, but don\'t be alarmed if something doesn\'t quite make sense. You can always create your own free test event at [pretalx.com](https://pretalx.com)!""" +Feel free to look around, but don\'t be alarmed if something doesn\'t quite make sense. You can always create your own free test event at [eventyay.com](https://eventyay.com)!""" with scopes_disabled(): event = Event.objects.create( name="DemoCon", diff --git a/src/pretalx/common/models/settings.py b/src/pretalx/common/models/settings.py index 45a85be41..97d003d13 100644 --- a/src/pretalx/common/models/settings.py +++ b/src/pretalx/common/models/settings.py @@ -86,7 +86,7 @@ def i18n_unserialise(value): gettext_noop( """Hi, -we hope you’re happy with pretalx as your event’s CfP system. +we hope you’re happy with eventyay as your event’s CfP system. These links may be helpful in the coming days and weeks: - Your event’s dashboard: {event_dashboard} @@ -94,8 +94,8 @@ def i18n_unserialise(value): - Your schedule editor: {event_schedule} If there is anything you’re missing, come tell us about it -at https://github.com/pretalx/pretalx/issues/new or via an -email to support@pretalx.com! +at https://github.com/fossasia/eventyay-talk/issues/new or via an +email to support@eventyay.com! """ ) ), @@ -139,8 +139,8 @@ def i18n_unserialise(value): - Over the course of the event, you sent {mail_count} mails. If there is anything you’re missing, come tell us about it -at https://github.com/pretalx/pretalx/issues/new or via an -email to support@pretalx.com! +at https://github.com/fossasia/eventyay-talk/issues/new or via an +email to support@eventyay.com! """ ) ), diff --git a/src/pretalx/common/templates/400.html b/src/pretalx/common/templates/400.html index 952bb0d5f..f551c90b7 100644 --- a/src/pretalx/common/templates/400.html +++ b/src/pretalx/common/templates/400.html @@ -16,7 +16,7 @@

{% blocktranslate trimmed %} - It looks as if the communication between you and pretalx went wrong in + It looks as if the communication between you and eventyay went wrong in some way.
Please return to the last page and try again! diff --git a/src/pretalx/common/templates/500.html b/src/pretalx/common/templates/500.html index 5382271e3..9f1d07be5 100644 --- a/src/pretalx/common/templates/500.html +++ b/src/pretalx/common/templates/500.html @@ -12,14 +12,5 @@

-
-

- {% if development_mode %} - {% blocktranslate with link="https://github.com/pretalx/pretalx/issues/new?template=bug_report.md&title=Error+on+"|add:request_path trimmed %} - Please help us to fix this by submitting a bug report! - {% endblocktranslate %} - {% endif %} -

-
{% endblock error_message %} {% block error_code %}500{% endblock error_code %} diff --git a/src/pretalx/common/templates/common/base.html b/src/pretalx/common/templates/common/base.html index 75aebe6c0..18536730a 100644 --- a/src/pretalx/common/templates/common/base.html +++ b/src/pretalx/common/templates/common/base.html @@ -20,7 +20,7 @@ {% endif %} - + {% block meta_image %}{% if request.event %} diff --git a/src/pretalx/common/templates/common/user_api_token.html b/src/pretalx/common/templates/common/user_api_token.html index 38283d4b4..c8388de38 100644 --- a/src/pretalx/common/templates/common/user_api_token.html +++ b/src/pretalx/common/templates/common/user_api_token.html @@ -8,8 +8,8 @@

{% translate "API Access" %}

- {% blocktranslate trimmed with apiurl='href="/api/events/" target="_blank" rel="noopener"' docurl='href="https://docs.pretalx.org/en/latest/api/index.html" target="_blank" rel="noopener"' %} - This token can be used to access the pretalx API. + {% blocktranslate trimmed with apiurl='href="/api/events/" target="_blank" rel="noopener"' docurl='href="#" target="_blank" rel="noopener"' %} + This token can be used to access the eventyay API. You can generate a new token, which will invalidate the old one. To find out more, please have a look at the API documentation. diff --git a/src/pretalx/event/models/event.py b/src/pretalx/event/models/event.py index 03d55242b..b3b15783f 100644 --- a/src/pretalx/event/models/event.py +++ b/src/pretalx/event/models/event.py @@ -218,7 +218,7 @@ class Event(PretalxModel): ], verbose_name=_("Main event colour"), help_text=_( - "Provide a hex value like #00ff00 if you want to style pretalx in your event’s colour scheme." + "Provide a hex value like #00ff00 if you want to style eventyay in your event’s colour scheme." ), ) custom_css = models.FileField( diff --git a/src/pretalx/frontend/schedule-editor/src/App.vue b/src/pretalx/frontend/schedule-editor/src/App.vue index 80c9ab217..6ca27b20b 100644 --- a/src/pretalx/frontend/schedule-editor/src/App.vue +++ b/src/pretalx/frontend/schedule-editor/src/App.vue @@ -540,7 +540,7 @@ export default { #btn-save margin-left: auto font-weight: bold; - button-style(color: #3aa57c) + button-style(color: #2185d0) [type=submit] display: none .data diff --git a/src/pretalx/orga/forms/event.py b/src/pretalx/orga/forms/event.py index 4e84aa079..9522298c8 100644 --- a/src/pretalx/orga/forms/event.py +++ b/src/pretalx/orga/forms/event.py @@ -58,7 +58,7 @@ class EventForm(ReadOnlyFlag, I18nHelpText, JsonSubfieldMixin, I18nModelForm): choices=[], widget=MultipleLanguagesWidget, help_text=_( - "Users will be able to use pretalx in these languages, and you will be able to provide all texts in these" + "Users will be able to use eventyay in these languages, and you will be able to provide all texts in these" " languages. If you don’t provide a text in the language a user selects, it will be shown in your event’s" " default language instead." ), @@ -573,7 +573,7 @@ class WidgetSettingsForm(JsonSubfieldMixin, forms.Form): show_widget_if_not_public = forms.BooleanField( label=_("Show the widget even if the schedule is not public"), help_text=_( - "Set to allow external pages to show the schedule widget, even if the schedule is not shown here using pretalx." + "Set to allow external pages to show the schedule widget, even if the schedule is not shown here using eventyay." ), required=False, ) diff --git a/src/pretalx/orga/forms/widgets.py b/src/pretalx/orga/forms/widgets.py index 65cfdf207..6b053fc2e 100644 --- a/src/pretalx/orga/forms/widgets.py +++ b/src/pretalx/orga/forms/widgets.py @@ -38,7 +38,7 @@ def sort(self): ( _("Community translations"), _( - "These translations are not maintained by the pretalx team. " + "These translations are not maintained by the eventyay team. " "We cannot vouch for their correctness, and new or recently changed features " "might not be translated and will show in English instead. " 'You can contribute to the translations.' diff --git a/src/pretalx/orga/templates/orga/admin/admin.html b/src/pretalx/orga/templates/orga/admin/admin.html index 873f5eb90..fcc11ed22 100644 --- a/src/pretalx/orga/templates/orga/admin/admin.html +++ b/src/pretalx/orga/templates/orga/admin/admin.html @@ -29,7 +29,7 @@

{% translate "Administrator information" %}

{% endif %}

- {% translate "Your pretalx version is:" %} {{ pretalx_version|copyable }}. + {% translate "Your eventyay version is:" %} {{ pretalx_version|copyable }}. {% url 'orga:admin.update' as update_url %} {% blocktranslate trimmed %} You can check for updates here. diff --git a/src/pretalx/orga/templates/orga/admin/update.html b/src/pretalx/orga/templates/orga/admin/update.html index 7bd9cceee..5aabb23b1 100644 --- a/src/pretalx/orga/templates/orga/admin/update.html +++ b/src/pretalx/orga/templates/orga/admin/update.html @@ -27,9 +27,9 @@

{% translate "Update check results" %}

{% translate "The last update check was not successful." %} {% if gs.settings.update_check_result.error == "http_error" %} - {% translate "The pretalx.com server returned an error code." %} + {% translate "The eventyay.com server returned an error code." %} {% elif gs.settings.update_check_result.error == "unavailable" %} - {% translate "The pretalx.com server could not be reached." %} + {% translate "The eventyay.com server could not be reached." %} {% elif gs.settings.update_check_result.error == "development" %} {% translate "This installation appears to be a development installation." %} {% endif %} diff --git a/src/pretalx/orga/templates/orga/base.html b/src/pretalx/orga/templates/orga/base.html index f6b1b757c..5e825a4d6 100644 --- a/src/pretalx/orga/templates/orga/base.html +++ b/src/pretalx/orga/templates/orga/base.html @@ -129,7 +129,7 @@
{% blocktranslate with link=link trimmed %} - You’re using pretalx as a superuser. This is not recommended. + You’re using eventyay as a superuser. This is not recommended. {% endblocktranslate %} {% translate "Please click here to switch to an administrator account." %} @@ -140,8 +140,8 @@
{% blocktranslate trimmed %} - Starting with version 1.1.0, pretalx automatically checks for updates in the background. - During this check, anonymous data is transmitted to servers operated by the pretalx + Starting with version 1.1.0, eventyay automatically checks for updates in the background. + During this check, anonymous data is transmitted to servers operated by the eventyay developers. Click on this message to find out more, disable this feature or enter your email address to get notified via email if a new update arrives. This message will disappear once you clicked it. diff --git a/src/pretalx/orga/templates/orga/event_list.html b/src/pretalx/orga/templates/orga/event_list.html index ebfac6e09..866dce109 100644 --- a/src/pretalx/orga/templates/orga/event_list.html +++ b/src/pretalx/orga/templates/orga/event_list.html @@ -19,7 +19,7 @@ {% if not hide_speaker_events and speaker_events %}
- {% translate "You are currently in the organiser area of pretalx. To view your submitted proposals, please go directly to the event page:" %} + {% translate "You are currently in the organiser area of eventyay. To view your submitted proposals, please go directly to the event page:" %} {% if speaker_events|length == 1 %} {{ event.name }} {% else %} diff --git a/src/pretalx/orga/templates/orga/review/assignment-import.html b/src/pretalx/orga/templates/orga/review/assignment-import.html index 102147337..45403c824 100644 --- a/src/pretalx/orga/templates/orga/review/assignment-import.html +++ b/src/pretalx/orga/templates/orga/review/assignment-import.html @@ -10,7 +10,7 @@ {% block content %}

{% translate "Assign reviewers" %}

- {% blocktranslate trimmed with href="https://github.com/pretalx/pretalx/blob/main/doc/user/review-assignments.json" %} + {% blocktranslate trimmed with href="#" %} You can upload your reviewer assignments from a JSON file here. You can either have the proposal codes (e.g. “UX3N1”) as keys, and user identification as values, or the other way around. User identification can be either the reviewer’s email address or their user code (e.g. “34KJN”). You can find an example file here. {% endblocktranslate %}

diff --git a/src/pretalx/orga/templates/orga/review/export.html b/src/pretalx/orga/templates/orga/review/export.html index 9f61c1a4e..035eaa87a 100644 --- a/src/pretalx/orga/templates/orga/review/export.html +++ b/src/pretalx/orga/templates/orga/review/export.html @@ -63,7 +63,7 @@

{% translate "Export review data" %}

 curl -H "Authorization: Token {{ request.user.auth_token.key }}" {{ request.event.api_urls.reviews.full }}
- + {% translate "Documentation" %} diff --git a/src/pretalx/orga/templates/orga/schedule/export.html b/src/pretalx/orga/templates/orga/schedule/export.html index 400e525d2..8d88e9f7a 100644 --- a/src/pretalx/orga/templates/orga/schedule/export.html +++ b/src/pretalx/orga/templates/orga/schedule/export.html @@ -45,7 +45,7 @@

{% translate "Export schedule data" %}