Skip to content

Commit

Permalink
Prep 3.2.0 release
Browse files Browse the repository at this point in the history
  • Loading branch information
cassidyjames committed May 24, 2024
1 parent d1723ac commit a276650
Show file tree
Hide file tree
Showing 5 changed files with 45 additions and 40 deletions.
3 changes: 2 additions & 1 deletion data/gresource.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<gresources>
<gresource prefix="/com/cassidyjames/plausible">
<gresource prefix="/com/cassidyjames/plausible/">
<file preprocess="xml-stripblanks">metainfo.xml</file>
<file>style.css</file>
<file>style-dark.css</file>
</gresource>
Expand Down
17 changes: 13 additions & 4 deletions data/metainfo.xml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,15 @@
<control>touch</control>
</supports>
<releases>
<release version="3.2.0" date="2024-05-24">
<description>
<p>Fresh Colors</p>
<ul>
<li>Updated colors throughout the app</li>
<li>More subtle header bar to fit in better in both light and dark styles</li>
</ul>
</description>
</release>
<release version="3.1.0" date="2024-04-22">
<description>
<p>Updated for GNOME 46</p>
Expand Down Expand Up @@ -124,16 +133,16 @@
</releases>
<screenshots>
<screenshot type="default">
<image>https://raw.githubusercontent.com/cassidyjames/tally/3.0.1/data/screenshots/dashboard-light.png</image>
<image>https://raw.githubusercontent.com/cassidyjames/tally/d1723acc47ff79df9764aeacd16eeb6091934cb2/data/screenshots/dashboard-light.png</image>
</screenshot>
<screenshot>
<image>https://raw.githubusercontent.com/cassidyjames/tally/3.0.1/data/screenshots/dashboard-dark.png</image>
<image>https://raw.githubusercontent.com/cassidyjames/tally/d1723acc47ff79df9764aeacd16eeb6091934cb2/data/screenshots/dashboard-dark.png</image>
</screenshot>
<screenshot>
<image>https://raw.githubusercontent.com/cassidyjames/tally/3.0.1/data/screenshots/sites-light.png</image>
<image>https://raw.githubusercontent.com/cassidyjames/tally/d1723acc47ff79df9764aeacd16eeb6091934cb2/data/screenshots/sites-light.png</image>
</screenshot>
<screenshot>
<image>https://raw.githubusercontent.com/cassidyjames/tally/3.0.1/data/screenshots/sites-dark.png</image>
<image>https://raw.githubusercontent.com/cassidyjames/tally/d1723acc47ff79df9764aeacd16eeb6091934cb2/data/screenshots/sites-dark.png</image>
</screenshot>
</screenshots>
<content_rating type="oars-1.1">
Expand Down
2 changes: 1 addition & 1 deletion meson.build
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
project(
'com.cassidyjames.plausible',
'vala', 'c',
version: '3.1.0'
version: '3.2.0'
)

gnome = import('gnome')
Expand Down
3 changes: 0 additions & 3 deletions src/App.vala
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@

public class Plausible.App : Adw.Application {
public const string NAME = "Tally";
public const string DEVELOPER = "Cassidy James Blaede";
public const string EMAIL = "[email protected]";
public const string URL = "https://cassidyjames.com";

public static GLib.Settings settings;

Expand Down
60 changes: 29 additions & 31 deletions src/MainWindow.vala
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public class Plausible.MainWindow : Adw.ApplicationWindow {
}

construct {
var sites_button = new Gtk.Button.with_label ("Sites") {
var sites_button = new Gtk.Button.with_label (_("Sites")) {
valign = Gtk.Align.CENTER
};
sites_button.add_css_class ("back-button");
Expand All @@ -44,6 +44,7 @@ public class Plausible.MainWindow : Adw.ApplicationWindow {

var app_menu = new Menu ();
app_menu.append (_("_Custom Domain…"), "win.custom_domain");
/// TRANSLATORS: %s is the app name
app_menu.append (_("_About %s").printf (App.NAME), "win.about");

var menu = new Menu ();
Expand Down Expand Up @@ -71,8 +72,9 @@ public class Plausible.MainWindow : Adw.ApplicationWindow {
}

var status_page = new Adw.StatusPage () {
/// TRANSLATORS: %s is the app name
title = _("%s for Plausible").printf (App.NAME),
/// TRANSLATORS: the string is the domain name, e.g. plausible.io
/// TRANSLATORS: %s is the Plausible instance's domain name
description = _("Loading the <b>%s</b> dashboard…").printf (domain),
icon_name = APP_ID
};
Expand Down Expand Up @@ -212,14 +214,15 @@ public class Plausible.MainWindow : Adw.ApplicationWindow {
domain_grid.attach (domain_entry, 1, 0);

var domain_dialog = new Adw.AlertDialog (
"Set a Custom Domain",
"If you’re self-hosting Plausible or using an instance other than <b>%s</b>, set the domain name.".printf (domain)
_("Set a Custom Domain"),
/// TRANSLATORS: %s is the Plausible instance's domain name
_("If you’re self-hosting Plausible or using an instance other than <b>%s</b>, set the domain name.").printf (domain)
) {
body_use_markup = true,
default_response = "save",
extra_child = domain_grid,
};
domain_dialog.add_response ("close", "_Cancel");
domain_dialog.add_response ("close", _("_Cancel"));
domain_dialog.add_response ("save", _("_Set Domain"));
domain_dialog.set_response_appearance ("save", Adw.ResponseAppearance.SUGGESTED);

Expand Down Expand Up @@ -247,13 +250,14 @@ public class Plausible.MainWindow : Adw.ApplicationWindow {
string domain = App.settings.get_string ("domain");

var log_out_dialog = new Adw.AlertDialog (
"Log out of Plausible?",
"You will need to re-enter your email and password for <b>%s</b> to log back in.".printf (domain)
_("Log out of Plausible?"),
/// TRANSLATORS: %s is the Plausible instance's domain name
_("You will need to re-enter your email and password for <b>%s</b> to log back in.").printf (domain)
) {
body_use_markup = true,
default_response = "log_out"
};
log_out_dialog.add_response ("close", "_Stay Logged In");
log_out_dialog.add_response ("close", _("_Stay Logged In"));
log_out_dialog.add_response ("log_out", _("_Log Out"));
log_out_dialog.set_response_appearance ("log_out", Adw.ResponseAppearance.DESTRUCTIVE);

Expand All @@ -278,33 +282,27 @@ public class Plausible.MainWindow : Adw.ApplicationWindow {
}

private void on_about_activate () {
var about_window = new Adw.AboutDialog () {
// transient_for = this,

application_icon = APP_ID,
var about_dialog = new Adw.AboutDialog.from_appdata (
"/com/cassidyjames/plausible/metainfo.xml", VERSION
) {
/// TRANSLATORS: %s is the app name
application_name = _("%s for Plausible").printf (App.NAME),
developer_name = App.DEVELOPER,
version = VERSION,

comments = _("Tally is a hybrid native + web app for Plausible Analytics, the lightweight and open-source website analytics tool."),

website = App.URL,
issue_url = "https://github.com/cassidyjames/plausible/issues",

// Credits
developers = { "%s <%s>".printf (App.DEVELOPER, App.EMAIL) },
designers = { "%s %s".printf (App.DEVELOPER, App.URL) },

/// The translator credits. Please translate this with your name(s).
/// TRANSLATORS: Translator credits; please translate this with your name(s)!
translator_credits = _("translator-credits"),

// Legal
copyright = "Copyright © 2020–2022 %s".printf (App.DEVELOPER),
license_type = Gtk.License.GPL_3_0,
artists = {
"Micah Ilbery https://ilbery.family/@micah",
},
};
about_window.add_link (_("About Plausible Analytics"), "https://plausible.io/about");
about_window.add_link (_("Plausible Analytics Privacy Policy"), "https://plausible.io/privacy");
about_window.add_legal_section ("Plausible Analytics", null, Gtk.License.CUSTOM,
about_dialog.copyright = "© 2020–%i %s".printf (
new DateTime.now_local ().get_year (),
about_dialog.developer_name
);

about_dialog.add_link (_("About Plausible Analytics"), "https://plausible.io/about");
about_dialog.add_link (_("Plausible Analytics Privacy Policy"), "https://plausible.io/privacy");
about_dialog.add_legal_section ("Plausible Analytics", null, Gtk.License.CUSTOM,
"""Plausible Analytics is a product of:
Plausible Insights OÜ
Expand All @@ -316,6 +314,6 @@ Email: [email protected]
"""
);

about_window.present (this);
about_dialog.present (this);
}
}

0 comments on commit a276650

Please sign in to comment.