Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/components/home/UpcomingList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,9 @@ export default function UpcomingList({ data, limit = 4, favoritesOnly = false }:
<Card.Content>
{header}
<Text variant="bodySmall" style={{ color: colors.onSurfaceVariant }}>
{favoritesOnly ? "No upcoming favorites." : "No upcoming sessions or breaks."}
{favoritesOnly
? "No upcoming favourites."
: "No upcoming sessions or breaks."}
</Text>
{helperNote}
</Card.Content>
Expand Down
2 changes: 1 addition & 1 deletion src/components/schedule/SessionListItem.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ function SessionListItem({
favoriteColor={starColor}
defaultColor={colors.onSurfaceVariant}
accessibilityLabel={
isFavorite ? "Remove from favorites" : "Add to favorites"
isFavorite ? "Remove from favourites" : "Add to favourites"
}
style={{ marginRight: spacing.xs }}
/>
Expand Down
2 changes: 1 addition & 1 deletion src/data/onboarding.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export const onboardingSlides: Slide[] = [
{
key: "overview",
title: "Everything you need, in one place",
body: "Browse the schedule, explore speakers, and create your personalized agenda with favorites.",
body: "Browse the schedule, explore speakers, and create your personalised agenda with favourites.",
},
{
key: "plan",
Expand Down
4 changes: 2 additions & 2 deletions src/hooks/useCalendarSync.ts
Original file line number Diff line number Diff line change
Expand Up @@ -126,12 +126,12 @@ export function useCalendarSync() {
const confirmAddAllSessions = useCallback(
(sessions: Session[], year: number, opts?: BulkOptions) => {
if (sessions.length === 0) {
Alert.alert("No favorites to add");
Alert.alert("No favourites to add");
return;
}
const lead = opts?.leadMinutes ?? DEFAULT_NOTIFICATION_LEAD_MINUTES;
Alert.alert(
"Add all favorites?",
"Add all favourites?",
`We'll add all starred sessions to your calendar with a ${lead}-minute reminder.`,
[
{ text: "Cancel", style: "cancel" },
Expand Down
22 changes: 11 additions & 11 deletions src/screens/SettingsScreen.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ export default function SettingsScreen() {

const handleExportFavorites = async () => {
if (favorites.size === 0) {
Alert.alert("No favorites to export");
Alert.alert("No favourites to export");
return;
}
const lines = Array.from(favorites).map((id) => {
Expand All @@ -131,18 +131,18 @@ export default function SettingsScreen() {
try {
await Share.share({ message });
} catch (err) {
console.warn("Failed to share favorites", err);
Alert.alert("Could not export favorites");
console.warn("Failed to share favourites", err);
Alert.alert("Could not export favourites");
}
};

const handleClearFavorites = () => {
if (favorites.size === 0) {
Alert.alert("No favorites to clear");
Alert.alert("No favourites to clear");
return;
}
Alert.alert(
"Clear favorites",
"Clear favourites",
"Remove all starred sessions?",
[
{ text: "Cancel", style: "cancel" },
Expand Down Expand Up @@ -206,16 +206,16 @@ export default function SettingsScreen() {
/>
</SettingsSection>

<SettingsSection title="Favorites">
<SettingsSection title="Favourites">
<Text variant="bodyMedium">
Saved sessions (year {favoritesYear ?? conferenceYear}): {favorites.size}
</Text>
<View style={styles.row}>
<Button mode="text" onPress={handleExportFavorites}>
Export favorites
Export favourites
</Button>
<Button mode="text" onPress={handleClearFavorites}>
Clear favorites
Clear favourites
</Button>
</View>
</SettingsSection>
Expand All @@ -238,7 +238,7 @@ export default function SettingsScreen() {
<Card.Content>
<SettingsSwitchRow
title="Upcoming session reminders"
subtitle={`Receive a reminder ${notificationLeadMinutes} minutes before keynotes and any sessions you have favorited start.`}
subtitle={`Receive a reminder ${notificationLeadMinutes} minutes before keynotes and any sessions you have favourited start.`}
value={notificationsEnabled}
disabled={Platform.OS === "web"}
onValueChange={async (val) => {
Expand Down Expand Up @@ -307,7 +307,7 @@ export default function SettingsScreen() {
<SettingsSection title="Haptics">
<SettingsSwitchRow
title="Haptic feedback"
subtitle="Haptic feedback for actions like refreshing, toggles, onboarding steps, and favorites/calendar. Some haptics may still occur if system-level."
subtitle="Haptic feedback for actions like refreshing, toggles, onboarding steps, and favourites/calendar. Some haptics may still occur if system-level."
value={hapticsEnabled}
disabled={Platform.OS === "web"}
onValueChange={async (val) => {
Expand Down Expand Up @@ -349,7 +349,7 @@ export default function SettingsScreen() {
<Text variant="bodyMedium">EuroPython Companion</Text>
<Text variant="bodySmall" style={{ color: colors.onSurfaceVariant }}>
Your companion app for EuroPython conferences. Plan your schedule, star
favorite sessions, and stay updated with the latest information.
favourite sessions, and stay updated with the latest information.
</Text>
</SettingsSection>
</PaddedScrollView>
Expand Down
6 changes: 3 additions & 3 deletions src/store/favorites.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ export function FavoritesProvider({
try {
await saveFavorites(next, year);
} catch (err) {
console.warn("Failed to save favorites", err);
console.warn("Failed to save favourites", err);
throw err;
}
},
Expand All @@ -84,7 +84,7 @@ export function FavoritesProvider({
try {
await persist(nextState);
} catch (err) {
console.warn("Failed to save favorites", err);
console.warn("Failed to save favourites", err);
if (prevSnapshot) {
setFavorites(prevSnapshot);
}
Expand Down Expand Up @@ -132,7 +132,7 @@ export function FavoritesProvider({
try {
await persist(new Set());
} catch (err) {
console.warn("Failed to clear favorites", err);
console.warn("Failed to clear favourites", err);
}
},
year,
Expand Down