Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 14ee3e12 authored by Dominik Schürmann's avatar Dominik Schürmann Committed by GitHub
Browse files

Show unnamed calendar instead of null or empty name (#647)

parent fe1309ef
Loading
Loading
Loading
Loading
+7 −6
Original line number Diff line number Diff line
@@ -761,6 +761,7 @@
    <string name="show_time_start_end_below">Start and end time below the event</string>

    <!-- Preferences -->
    <string name="preferences_calendar_no_display_name">Unnamed calendar</string>
    <string name="preferences_calendar_account">%1$s account</string>
    <string name="preferences_calendar_delete">Delete calendar</string>
    <string name="preferences_calendar_display_name">Change name</string>
@@ -768,6 +769,12 @@
    <string name="preferences_calendar_color">Color</string>
    <string name="preferences_calendar_visible">Display events</string>
    <string name="preferences_calendar_synchronize">Synchronize this calendar</string>
    <string name="preferences_calendar_color_warning_title">Warning</string>
    <string name="preferences_calendar_color_warning_message">Changing the color may be reverted when the calendar is synchronized again.\n\nIn DAVx⁵ \'Manage calendar colors\' can be disabled to prevent this.</string>
    <string name="preferences_calendar_color_warning_button">I understand</string>
    <string name="preferences_calendar_delete_message">Do you really want to delete this calendar?</string>
    <string name="preferences_calendar_delete_delete">Delete calendar</string>
    <string name="preferences_calendar_delete_cancel">Cancel</string>
    <string name="preferences_list_calendar_summary_sync_off">Not synchronized</string>
    <string name="preferences_list_calendar_summary_invisible">Events are not displayed</string>
    <string name="preferences_list_general">General settings</string>
@@ -779,12 +786,6 @@
    <string name="preferences_list_add_offline_button">Add calendar</string>
    <string name="preferences_list_add_offline_name">Name</string>
    <string name="preferences_list_add_offline_cancel">Cancel</string>
    <string name="preferences_calendar_color_warning_title">Warning</string>
    <string name="preferences_calendar_color_warning_message">Changing the color may be reverted when the calendar is synchronized again.\n\nIn DAVx⁵ \'Manage calendar colors\' can be disabled to prevent this.</string>
    <string name="preferences_calendar_color_warning_button">I understand</string>
    <string name="preferences_calendar_delete_message">Do you really want to delete this calendar?</string>
    <string name="preferences_calendar_delete_delete">Delete calendar</string>
    <string name="preferences_calendar_delete_cancel">Cancel</string>
    <string name="preferences_menu_about">About Etar</string>

    <string name="offline_account_name">Offline Calendar</string>
+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ class MainListPreferences : PreferenceFragmentCompat() {
            }
            calendarPreference.apply {
                key = calendarUniqueKey
                title = calendar.displayName
                title = if (calendar.displayName.isNullOrBlank()) getString(R.string.preferences_calendar_no_display_name) else calendar.displayName
                fragment = CalendarPreferences::class.java.name
                order = if (calendar.isPrimary) 1 else 2 // primary calendar is first, others are alphabetically ordered below
                icon = getCalendarIcon(calendar.color, calendar.visible, calendar.syncEvents)