Skip to content

Commit

Permalink
Merge pull request #514 from bcc-code/develop
Browse files Browse the repository at this point in the history
Release to production
  • Loading branch information
kkuepper committed Jan 1, 2024
2 parents 3932097 + 8ed2e2a commit 613ad63
Show file tree
Hide file tree
Showing 53 changed files with 797 additions and 448 deletions.
1 change: 1 addition & 0 deletions BMM.Api/Framework/HTTP/ApiUris.cs
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ public class ApiUris
public const string StatisticsPostStreakPoints = "statistics/streakpoint";
public const string StatisticsListening = "statistics/listening";
public const string StatisticsAchievement = "statistics/achievement";
public const string StatisticsAchievements = "statistics/achievements";
public const string AchievementAcknowledge = "statistics/achievement/{name}/acknowledge";

public const string Podcasts = "podcast/";
Expand Down
8 changes: 8 additions & 0 deletions BMM.Api/Implementation/Clients/StatisticsClient.cs
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,14 @@ public Task<ProjectRules> GetProjectRules(string lang, int projectId)
return Get<ProjectRules>(uri);
}

// public Task GetAchievements(string lang, AppTheme theme)
// {
// var uri = new UriTemplate(ApiUris.StatisticsAchievements);
// uri.SetParameter("lang", lang);
// uri.SetParameter("theme", theme);
// return Get(uri);
// }
//
public Task AchievementAcknowledge(string achievementType)
{
var uri = new UriTemplate(ApiUris.AchievementAcknowledge);
Expand Down
7 changes: 4 additions & 3 deletions BMM.Core/Models/ProfileListItem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,12 @@ namespace BMM.Core.Models
public class ProfileListItem : SelectableListItem
{
public string Username { get; set; }

public string UserProfileUrl { get; set; }


public string AchievementsText { get; set; }
public IMvxCommand LogoutCommand { get; set; }


public IMvxCommand AchievementsClickedCommand { get; set; }
public IMvxCommand EditProfileCommand { get; set; }
}
}
8 changes: 6 additions & 2 deletions BMM.Core/Translation/af/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,8 @@
"ColorText": "Choose between custom color themes",
"SiriShortcutsHeader": "Siri Shortcuts",
"SiriShortcutsText": "Add Siri Shortcuts for BMM to your device",
"PushNotificationsGoToSettings": "Unfortunately we cannot enable Push Notifications as they are disabled in your device settings. Please allow Push Notifications in your device settings to enable this feature."
"PushNotificationsGoToSettings": "Unfortunately we cannot enable Push Notifications as they are disabled in your device settings. Please allow Push Notifications in your device settings to enable this feature.",
"Achievements": "Achievements"
},
"StorageManagementViewModel": {
"Title": "Location for offline tracks",
Expand Down Expand Up @@ -594,7 +595,10 @@
},
"AskQuestionConfirmationViewModel": {
"ThankYou": "Thanks for asking!",
"Description": "All questions will be reviewed and some will be answered in the podcast. \n Most questions will be answered on the Q&A page. \n\n Check back on Monday to read the replies.",
"Description": "All questions will be reviewed and some will be answered in the podcast. \n Most questions will be answered on the Q&A page. \n\n Check back on Wednesday to read the replies.",
"GotIt": "Got it"
},
"AchievementsViewModel": {
"Title": "Achievements"
}
}
252 changes: 128 additions & 124 deletions BMM.Core/Translation/bg/main.json

Large diffs are not rendered by default.

20 changes: 12 additions & 8 deletions BMM.Core/Translation/da/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -314,8 +314,8 @@
"OptionContactHeader": "Kontakt",
"OptionContactText": "Spørgsmål eller tilbagemeldinger? Kontakt BMM-teamet her.",
"OptionAppVersionHeader": "App-version",
"OptionDeleteAccountHeader": "Delete Account",
"OptionDeleteAccountText": "Request that your account is deleted.",
"OptionDeleteAccountHeader": "Slet min konto",
"OptionDeleteAccountText": "Anmod om at din konto bliver slettet.",
"AppInfoTitle": "App-information",
"AppInfoAppVersion": "App-version: ",
"AppInfoManufacturer": "Producent: ",
Expand All @@ -333,7 +333,8 @@
"ColorText": "Vælg mellem brugerdefinerede farvetemaer",
"SiriShortcutsHeader": "Siri genveje",
"SiriShortcutsText": "Tilføj Siri genveje for BMM til din enhed",
"PushNotificationsGoToSettings": "Desværre kan vi ikke aktivere push-meddelelser, da de er deaktiveret i dine enhedsindstillinger. Tillad venligst push-meddelelser i dine enhedsindstillinger for at aktivere denne funktion."
"PushNotificationsGoToSettings": "Desværre kan vi ikke aktivere push-meddelelser, da de er deaktiveret i dine enhedsindstillinger. Tillad venligst push-meddelelser i dine enhedsindstillinger for at aktivere denne funktion.",
"Achievements": "Achievements"
},
"StorageManagementViewModel": {
"Title": "Lagringsplads til offline indhold",
Expand Down Expand Up @@ -588,13 +589,16 @@
"SubmitSuccess": "Forslag sendt, mange tak!"
},
"AskQuestionViewModel": {
"Title": "Ask a question",
"Submit": "Submit question",
"Hint": "Your question"
"Title": "Stil et spørgsmål",
"Submit": "Send spørgsmål",
"Hint": "Dit spørgsmål"
},
"AskQuestionConfirmationViewModel": {
"ThankYou": "Thanks for asking!",
"Description": "All questions will be reviewed and some will be answered in the podcast. \n Most questions will be answered on the Q&A page. \n\n Check back on Monday to read the replies.",
"ThankYou": "Tak fordi du spurgte!",
"Description": "Alle spørgsmål vil blive gennemgået, og nogle vil blive besvaret i podcasten. \n De fleste spørgsmål vil blive besvaret på Q&A-siden. \n\n Kom tilbage på onsdag for at læse svarene.",
"GotIt": "Forstået"
},
"AchievementsViewModel": {
"Title": "Achievements"
}
}
12 changes: 8 additions & 4 deletions BMM.Core/Translation/de/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -200,8 +200,8 @@
},
"FollowedPodcastsViewModel": {
"Title": "Abonnierte Podcasts",
"EmptyTitle": "Du hast zurzeit keine Podcast abonniert",
"EmptySubline": "Folge einem Podcast indem du den Podcast öffnest und dann abonnieren klickst."
"EmptyTitle": "Du hast zurzeit keine Podcasts abonniert",
"EmptySubline": "Folge einem Podcast, indem du den Podcast öffnest und dann abonnieren klickst."
},
"MyTracksViewModel": {
"Title": "Meine Titel",
Expand Down Expand Up @@ -333,7 +333,8 @@
"ColorText": "Wähle zwischen speziellen Farbthemen",
"SiriShortcutsHeader": "Siri-Kurzbefehle",
"SiriShortcutsText": "Aktiviere Siri-Kurzbefehle für BMM ",
"PushNotificationsGoToSettings": "Leider können wir Push-Benachrichtigungen nicht aktivieren, da diese in den Einstellungen deines Geräts deaktiviert sind. Bitte erlaube Push-Benachrichtigungen in deinen Geräteeinstellungen, um diese Funktion zu aktivieren."
"PushNotificationsGoToSettings": "Leider können wir Push-Benachrichtigungen nicht aktivieren, da diese in den Einstellungen deines Geräts deaktiviert sind. Bitte erlaube Push-Benachrichtigungen in deinen Geräteeinstellungen, um diese Funktion zu aktivieren.",
"Achievements": "Achievements"
},
"StorageManagementViewModel": {
"Title": "Speicherort für Offline-Dateien",
Expand Down Expand Up @@ -594,7 +595,10 @@
},
"AskQuestionConfirmationViewModel": {
"ThankYou": "Danke für deine Frage!",
"Description": "Alle Fragen werden überprüft und manche werden im Podcast beantwortet. \n Die meisten Fragen werden auf der Q&A Seite beantwortet. \n \n Schaue am Montag nach, um die Antworten zu lesen.",
"Description": "Alle Fragen werden besprochen und einige werden im Podcast beantwortet. \n Die meisten Fragen werden auf der Q&A-Seite beantwortet. \n\n Schaue am Mittwoch noch einmal vorbei, um die Antworten zu lesen.",
"GotIt": "Verstanden! "
},
"AchievementsViewModel": {
"Title": "Achievements"
}
}
2 changes: 2 additions & 0 deletions BMM.Core/Translation/en/Translations.designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 6 additions & 2 deletions BMM.Core/Translation/en/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,8 @@
"ColorText": "Choose between custom color themes",
"SiriShortcutsHeader": "Siri Shortcuts",
"SiriShortcutsText": "Add Siri Shortcuts for BMM to your device",
"PushNotificationsGoToSettings": "Unfortunately we cannot enable Push Notifications as they are disabled in your device settings. Please allow Push Notifications in your device settings to enable this feature."
"PushNotificationsGoToSettings": "Unfortunately we cannot enable Push Notifications as they are disabled in your device settings. Please allow Push Notifications in your device settings to enable this feature.",
"Achievements": "Achievements"
},
"StorageManagementViewModel": {
"Title": "Location for offline tracks",
Expand Down Expand Up @@ -594,7 +595,10 @@
},
"AskQuestionConfirmationViewModel": {
"ThankYou": "Thanks for asking!",
"Description": "All questions will be reviewed and some will be answered in the podcast. \n Most questions will be answered on the Q&A page. \n\n Check back on Monday to read the replies.",
"Description": "All questions will be reviewed and some will be answered in the podcast. \n Most questions will be answered on the Q&A page. \n\n Check back on Wednesday to read the replies.",
"GotIt": "Got it"
},
"AchievementsViewModel": {
"Title": "Achievements"
}
}
8 changes: 6 additions & 2 deletions BMM.Core/Translation/es/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,8 @@
"ColorText": "Elija entre colores de temas personalizados",
"SiriShortcutsHeader": "Accesos directos de Siri",
"SiriShortcutsText": "Añadir accesos directos de Siri para BMM a tu dispositivo",
"PushNotificationsGoToSettings": "Lamentablemente, no podemos habilitar las notificaciones automáticas ya que están deshabilitadas en la configuración de su dispositivo. Permita las notificaciones automáticas en la configuración de su dispositivo para habilitar esta función."
"PushNotificationsGoToSettings": "Lamentablemente, no podemos habilitar las notificaciones automáticas ya que están deshabilitadas en la configuración de su dispositivo. Permita las notificaciones automáticas en la configuración de su dispositivo para habilitar esta función.",
"Achievements": "Achievements"
},
"StorageManagementViewModel": {
"Title": "Ubicación de las pistas sin conexión",
Expand Down Expand Up @@ -594,7 +595,10 @@
},
"AskQuestionConfirmationViewModel": {
"ThankYou": "Thanks for asking!",
"Description": "All questions will be reviewed and some will be answered in the podcast. \n Most questions will be answered on the Q&A page. \n\n Check back on Monday to read the replies.",
"Description": "All questions will be reviewed and some will be answered in the podcast. \n Most questions will be answered on the Q&A page. \n\n Check back on Wednesday to read the replies.",
"GotIt": "Entiendo"
},
"AchievementsViewModel": {
"Title": "Achievements"
}
}
8 changes: 6 additions & 2 deletions BMM.Core/Translation/et/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,8 @@
"ColorText": "Choose between custom color themes",
"SiriShortcutsHeader": "Siri Shortcuts",
"SiriShortcutsText": "Add Siri Shortcuts for BMM to your device",
"PushNotificationsGoToSettings": "Unfortunately we cannot enable Push Notifications as they are disabled in your device settings. Please allow Push Notifications in your device settings to enable this feature."
"PushNotificationsGoToSettings": "Unfortunately we cannot enable Push Notifications as they are disabled in your device settings. Please allow Push Notifications in your device settings to enable this feature.",
"Achievements": "Achievements"
},
"StorageManagementViewModel": {
"Title": "Location for offline tracks",
Expand Down Expand Up @@ -594,7 +595,10 @@
},
"AskQuestionConfirmationViewModel": {
"ThankYou": "Thanks for asking!",
"Description": "All questions will be reviewed and some will be answered in the podcast. \n Most questions will be answered on the Q&A page. \n\n Check back on Monday to read the replies.",
"Description": "All questions will be reviewed and some will be answered in the podcast. \n Most questions will be answered on the Q&A page. \n\n Check back on Wednesday to read the replies.",
"GotIt": "Got it"
},
"AchievementsViewModel": {
"Title": "Achievements"
}
}
8 changes: 6 additions & 2 deletions BMM.Core/Translation/fi/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,8 @@
"ColorText": "Valitse erikoisväriteemoista",
"SiriShortcutsHeader": "Siriin",
"SiriShortcutsText": "Lisää Sirilinkit laitteesi BMM:än",
"PushNotificationsGoToSettings": "Valitettavasti laiteasetuksissasi reaaliaikaiset ilmoitukset on poistettu käytöstä. Ole hyvä ja salli reaaliaikaiset ilmoitukset laiteasetuksissasi. "
"PushNotificationsGoToSettings": "Valitettavasti laiteasetuksissasi reaaliaikaiset ilmoitukset on poistettu käytöstä. Ole hyvä ja salli reaaliaikaiset ilmoitukset laiteasetuksissasi. ",
"Achievements": "Achievements"
},
"StorageManagementViewModel": {
"Title": "Offline kappaleiden tallennus sijainti",
Expand Down Expand Up @@ -594,7 +595,10 @@
},
"AskQuestionConfirmationViewModel": {
"ThankYou": "Kiitos kysymyksestäsi!",
"Description": "Kaikki kysymykset katsotaan ja joihinkin vastataan podcastissa. Useimpiin vastataan \"kysymyksiä ja vastauksia\" -sivulla. \nMaanantaina voit lukea vastauksia.",
"Description": "Kaikki kysymykset katsotaan ja joihinkin vastataan podcastissa. Useimpiin vastataan \"kysymyksiä ja vastauksia\" -sivulla. \nKeskiviikkona voit lukea vastauksia.",
"GotIt": "Selvä"
},
"AchievementsViewModel": {
"Title": "Achievements"
}
}
20 changes: 12 additions & 8 deletions BMM.Core/Translation/fr/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -314,8 +314,8 @@
"OptionContactHeader": "Contact",
"OptionContactText": "Questions ou commentaires ? Contacter l'équipe ici.",
"OptionAppVersionHeader": "Version de l'application",
"OptionDeleteAccountHeader": "Delete Account",
"OptionDeleteAccountText": "Request that your account is deleted.",
"OptionDeleteAccountHeader": "Supprimer le compte",
"OptionDeleteAccountText": "Demander la suppression de votre compte.",
"AppInfoTitle": "Information sur l'application",
"AppInfoAppVersion": "Version de l'application: ",
"AppInfoManufacturer": "Fabricant :",
Expand All @@ -333,7 +333,8 @@
"ColorText": "Choisir un thème personnalisé",
"SiriShortcutsHeader": "Raccourcis Siri",
"SiriShortcutsText": "Ajouter des raccourcis Siri pour BMM à votre appareil",
"PushNotificationsGoToSettings": "Nous ne pouvons malheureusement pas activer les notifications push car elles sont désactivées dans les paramètres de ton appareil. Autorise les notifications push dans les paramètres de ton appareil pour activer cette fonction."
"PushNotificationsGoToSettings": "Nous ne pouvons malheureusement pas activer les notifications push car elles sont désactivées dans les paramètres de ton appareil. Autorise les notifications push dans les paramètres de ton appareil pour activer cette fonction.",
"Achievements": "Achievements"
},
"StorageManagementViewModel": {
"Title": "Emplacement des titres hors-ligne",
Expand Down Expand Up @@ -588,13 +589,16 @@
"SubmitSuccess": "Les suggestions de modification ont été soumises avec succès, merci !"
},
"AskQuestionViewModel": {
"Title": "Ask a question",
"Submit": "Submit question",
"Hint": "Your question"
"Title": "Poser une question",
"Submit": "Soumettre une question",
"Hint": "Votre question"
},
"AskQuestionConfirmationViewModel": {
"ThankYou": "Thanks for asking!",
"Description": "All questions will be reviewed and some will be answered in the podcast. \n Most questions will be answered on the Q&A page. \n\n Check back on Monday to read the replies.",
"ThankYou": "Merci d'avoir posé la question !",
"Description": "Toutes les questions seront examinées et certaines seront traitées dans le podcast. \n La plupart des questions seront traitées sur la page Q&R. \n\n Revenez mercredi pour lire les réponses.",
"GotIt": "J'ai compris"
},
"AchievementsViewModel": {
"Title": "Achievements"
}
}
8 changes: 6 additions & 2 deletions BMM.Core/Translation/hr/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,8 @@
"ColorText": "Choose between custom color themes",
"SiriShortcutsHeader": "Siri Shortcuts",
"SiriShortcutsText": "Add Siri Shortcuts for BMM to your device",
"PushNotificationsGoToSettings": "Unfortunately we cannot enable Push Notifications as they are disabled in your device settings. Please allow Push Notifications in your device settings to enable this feature."
"PushNotificationsGoToSettings": "Unfortunately we cannot enable Push Notifications as they are disabled in your device settings. Please allow Push Notifications in your device settings to enable this feature.",
"Achievements": "Achievements"
},
"StorageManagementViewModel": {
"Title": "Location for offline tracks",
Expand Down Expand Up @@ -594,7 +595,10 @@
},
"AskQuestionConfirmationViewModel": {
"ThankYou": "Thanks for asking!",
"Description": "All questions will be reviewed and some will be answered in the podcast. \n Most questions will be answered on the Q&A page. \n\n Check back on Monday to read the replies.",
"Description": "All questions will be reviewed and some will be answered in the podcast. \n Most questions will be answered on the Q&A page. \n\n Check back on Wednesday to read the replies.",
"GotIt": "Got it"
},
"AchievementsViewModel": {
"Title": "Achievements"
}
}
Loading

0 comments on commit 613ad63

Please sign in to comment.