WordPress.org
Get WordPress

Plugin Directory

Changeset 2212778


Ignore:
Timestamp:
12/16/2019 10:10:27 AM (6 years ago)
Author:
kerkenit
Message:

Release 1.2.6

Location:
promissa/trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • promissa/trunk/functions.php

    r2188087 r2212778  
    228228        }
    229229    }
    230 
    231     if (!function_exists('getDayOfWeekPlural'))
    232     {
    233         function getDayOfWeekPlural($i)
    234         {
    235             switch($i) {
    236                 case 1:
    237                     return __('mondays', 'promissa');
    238                 case 2:
    239                     return __('tuesdays', 'promissa');
    240                 case 3:
    241                     return __('wednesdays', 'promissa');
    242                 case 4:
    243                     return __('thursdays', 'promissa');
    244                 case 5:
    245                     return __('fridays', 'promissa');
    246                 case 6:
    247                     return __('saturdays', 'promissa');
    248                 case 7:
    249                     return __('sundays', 'promissa');
    250                 default:
    251                     return '';
    252             }
    253         }
    254     }
    255 
    256     if (!function_exists('getTimeOfDayOfWeek'))
    257     {
    258         function getTimeOfDayOfWeek($hour, $minutes)
    259         {
    260             return sprintf('%02d:%02d', $hour, $minutes);
    261         }
    262     }
    263230?>

  • promissa/trunk/languages/promissa-nl_NL.po

    r2207376 r2212778  
    22msgstr ""
    33"Project-Id-Version: Pro Missa\n"
    4 "POT-Creation-Date: 2019-12-06 19:22+0100\n"
    5 "PO-Revision-Date: 2019-12-06 19:22+0100\n"
     4"POT-Creation-Date: 2019-12-16 11:09+0100\n"
     5"PO-Revision-Date: 2019-12-16 11:09+0100\n"
    66"Last-Translator: Kerk en IT <info@kerkenit.nl>\n"
    77"Language-Team: Marco van 't Klooster <info@kerkenit.nl>\n"
    … …  
    7777msgstr "zondag"
    7878
    79 #: functions.php:237
    80 msgid "mondays"
    81 msgstr "maandags"
    82 
    83 #: functions.php:239
    84 msgid "tuesdays"
    85 msgstr "dinsdags"
    86 
    87 #: functions.php:241
    88 msgid "wednesdays"
    89 msgstr "woensdags"
    90 
    91 #: functions.php:243
    92 msgid "thursdays"
    93 msgstr "donderdags"
    94 
    95 #: functions.php:245
    96 msgid "fridays"
    97 msgstr "vrijdags"
    98 
    99 #: functions.php:247
    100 msgid "saturdays"
    101 msgstr "zaterdags"
    102 
    103 #: functions.php:249
    104 msgid "sundays"
    105 msgstr "zondags"
    106 
    107 #: promissa.php:86 promissa.php:87
     79#. Plugin Name of the plugin/theme
     80#: promissa.php:42 promissa.php:43
    10881msgid "Pro Missa"
    10982msgstr "Pro Missa"
    11083
    111 #: shortcodes/calendar.php:79
     84#: shortcodes/calendar.php:76
    11285msgid "Location"
    11386msgstr "Locatie"
    11487
    115 #: shortcodes/calendar.php:79
     88#: shortcodes/calendar.php:76
    11689msgid "Date"
    11790msgstr "Datum"
    11891
    119 #: shortcodes/calendar.php:79
     92#: shortcodes/calendar.php:76
    12093msgid "Time"
    12194msgstr "Aanvang"
    12295
    123 #: shortcodes/upcoming_mass.php:67
     96#: shortcodes/calendar.php:78
     97msgid "Note"
     98msgstr "Opmerking"
     99
     100#: shortcodes/upcoming_mass.php:69
    124101msgid "Today"
    125102msgstr "Vandaag"
    126103
    127 #: shortcodes/upcoming_mass.php:67
     104#: shortcodes/upcoming_mass.php:69
    128105msgid "Tomorrow"
    129106msgstr "Morgen"
    130107
    131 #: shortcodes/upcoming_mass.php:67
     108#: shortcodes/upcoming_mass.php:69
    132109msgid "Upcoming"
    133110msgstr "Aanstaande"
    134111
    135 #: shortcodes/upcoming_mass.php:69
     112#: shortcodes/upcoming_mass.php:76
    136113msgid "at"
    137114msgstr "om"
    138115
    139 #: shortcodes/upcoming_mass.php:69
     116#: shortcodes/upcoming_mass.php:78
    140117msgid "hour"
    141118msgstr "uur"
    142119
    143 #: shortcodes/upcoming_mass.php:77 shortcodes/upcoming_mass.php:79
     120#: shortcodes/upcoming_mass.php:87 shortcodes/upcoming_mass.php:89
    144121msgid "in the"
    145122msgstr "in de"
    146123
    147 #: widgets/upcoming_mass.php:13
     124#: widgets/upcoming_mass.php:12
    148125msgid ""
    149126"This widget will show the upcoming mass times. This is recommended if your "
    … …  
    153130"primaire doelgroep de zoekers naar geloof."
    154131
    155 #: widgets/upcoming_mass.php:16
     132#: widgets/upcoming_mass.php:15
    156133msgid "Upcoming Masses"
    157134msgstr "Komende vieringen"
    158135
    159 #: widgets/upcoming_mass.php:73
     136#: widgets/upcoming_mass.php:76
    160137msgid "Next Masses"
    161138msgstr "Komende vieringen"
    162139
    163 #: widgets/upcoming_mass.php:81
     140#: widgets/upcoming_mass.php:85
    164141msgid "Title:"
    165142msgstr "Titel:"
    166143
    167 #: widgets/upcoming_mass.php:85
     144#: widgets/upcoming_mass.php:89
    168145msgid "Subtitle:"
    169146msgstr "Ondertitel:"
    170147
    171 #: widgets/upcoming_mass.php:89
     148#: widgets/upcoming_mass.php:93
    172149msgid "Church:"
    173150msgstr "Kerk:"
    174151
    175 #: widgets/upcoming_mass.php:93
     152#: widgets/upcoming_mass.php:97
    176153msgid "All churches:"
    177154msgstr "Alle Kerkgebouwen:"
    178155
    179 #: widgets/upcoming_mass.php:102
     156#: widgets/upcoming_mass.php:106
    180157msgid "Count:"
    181158msgstr "Aantal:"
    182159
    183 #: widgets/upcoming_mass.php:113
     160#: widgets/upcoming_mass.php:117
     161msgid "Page:"
     162msgstr "Pagina:"
     163
     164#: widgets/upcoming_mass.php:128
    184165msgid "Show title:"
    185166msgstr "Toon titel:"
    186167
    187 #: widgets/upcoming_mass.php:118 widgets/upcoming_mass.php:129
     168#: widgets/upcoming_mass.php:133 widgets/upcoming_mass.php:144
    188169msgid "No"
    189170msgstr "Nee"
    190171
    191 #: widgets/upcoming_mass.php:118 widgets/upcoming_mass.php:129
     172#: widgets/upcoming_mass.php:133 widgets/upcoming_mass.php:144
    192173msgid "Yes"
    193174msgstr "Ja"
    194175
    195 #: widgets/upcoming_mass.php:124
     176#: widgets/upcoming_mass.php:139
    196177msgid "Show attendees:"
    197178msgstr "Toon aanwezigen:"
    198179
    199 #~ msgid "https://www.promissa.nl/plugins/wordpress"
    200 #~ msgstr "https://www.promissa.nl/plugins/wordpress"
    201 
    202 #~ msgid ""
    203 #~ "This plugin will give you shortcodes and widgets with the latest masses "
    204 #~ "and events of Pro Missa."
    205 #~ msgstr ""
    206 #~ "Deze plug-in geeft je shortcodes en widgets met de nieuwste missen en "
    207 #~ "evenementen van Pro Missa."
    208 
    209 #~ msgid "Kerk en IT"
    210 #~ msgstr "Kerk en IT"
    211 
    212 #~ msgid "https://www.kerkenit.nl"
    213 #~ msgstr "https://www.kerkenit.nl"
     180#. Plugin URI of the plugin/theme
     181msgid "https://www.promissa.nl/plugins/wordpress"
     182msgstr "https://www.promissa.nl/plugins/wordpress"
     183
     184#. Description of the plugin/theme
     185msgid ""
     186"This plugin will give you shortcodes and widgets with the latest masses and "
     187"events of Pro Missa."
     188msgstr ""
     189"Deze plug-in geeft je shortcodes en widgets met de nieuwste missen en "
     190"evenementen van Pro Missa."
     191
     192#. Author of the plugin/theme
     193msgid "Kerk en IT"
     194msgstr "Kerk en IT"
     195
     196#. Author URI of the plugin/theme
     197msgid "https://www.kerkenit.nl"
     198msgstr "https://www.kerkenit.nl"
     199
     200#~ msgid "mondays"
     201#~ msgstr "maandags"
     202
     203#~ msgid "tuesdays"
     204#~ msgstr "dinsdags"
     205
     206#~ msgid "wednesdays"
     207#~ msgstr "woensdags"
     208
     209#~ msgid "thursdays"
     210#~ msgstr "donderdags"
     211
     212#~ msgid "fridays"
     213#~ msgstr "vrijdags"
     214
     215#~ msgid "saturdays"
     216#~ msgstr "zaterdags"
     217
     218#~ msgid "sundays"
     219#~ msgstr "zondags"
    214220
    215221#~ msgid "Every"

  • promissa/trunk/languages/promissa.pot

    r2207376 r2212778  
    44"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
    55"Project-Id-Version: Pro Missa\n"
    6 "POT-Creation-Date: 2019-12-06 19:22+0100\n"
     6"POT-Creation-Date: 2019-12-16 11:09+0100\n"
    77"PO-Revision-Date: 2019-07-29 16:31+0200\n"
    88"Last-Translator: Kerk en IT <info@kerkenit.nl>\n"
    … …  
    7575msgstr ""
    7676
    77 #: functions.php:237
    78 msgid "mondays"
    79 msgstr ""
    80 
    81 #: functions.php:239
    82 msgid "tuesdays"
    83 msgstr ""
    84 
    85 #: functions.php:241
    86 msgid "wednesdays"
    87 msgstr ""
    88 
    89 #: functions.php:243
    90 msgid "thursdays"
    91 msgstr ""
    92 
    93 #: functions.php:245
    94 msgid "fridays"
    95 msgstr ""
    96 
    97 #: functions.php:247
    98 msgid "saturdays"
    99 msgstr ""
    100 
    101 #: functions.php:249
    102 msgid "sundays"
    103 msgstr ""
    104 
    10577#. Plugin Name of the plugin/theme
    106 #: promissa.php:86 promissa.php:87
     78#: promissa.php:42 promissa.php:43
    10779msgid "Pro Missa"
    10880msgstr ""
    10981
    110 #: shortcodes/calendar.php:79
     82#: shortcodes/calendar.php:76
    11183msgid "Location"
    11284msgstr ""
    11385
    114 #: shortcodes/calendar.php:79
     86#: shortcodes/calendar.php:76
    11587msgid "Date"
    11688msgstr ""
    11789
    118 #: shortcodes/calendar.php:79
     90#: shortcodes/calendar.php:76
    11991msgid "Time"
    12092msgstr ""
    12193
    122 #: shortcodes/upcoming_mass.php:67
     94#: shortcodes/calendar.php:78
     95msgid "Note"
     96msgstr ""
     97
     98#: shortcodes/upcoming_mass.php:69
    12399msgid "Today"
    124100msgstr ""
    125101
    126 #: shortcodes/upcoming_mass.php:67
     102#: shortcodes/upcoming_mass.php:69
    127103msgid "Tomorrow"
    128104msgstr ""
    129105
    130 #: shortcodes/upcoming_mass.php:67
     106#: shortcodes/upcoming_mass.php:69
    131107msgid "Upcoming"
    132108msgstr ""
    133109
    134 #: shortcodes/upcoming_mass.php:69
     110#: shortcodes/upcoming_mass.php:76
    135111msgid "at"
    136112msgstr ""
    137113
    138 #: shortcodes/upcoming_mass.php:69
     114#: shortcodes/upcoming_mass.php:78
    139115msgid "hour"
    140116msgstr ""
    141117
    142 #: shortcodes/upcoming_mass.php:77 shortcodes/upcoming_mass.php:79
     118#: shortcodes/upcoming_mass.php:87 shortcodes/upcoming_mass.php:89
    143119msgid "in the"
    144120msgstr ""
    145121
    146 #: widgets/upcoming_mass.php:13
     122#: widgets/upcoming_mass.php:12
    147123msgid ""
    148124"This widget will show the upcoming mass times. This is recommended if your "
    … …  
    150126msgstr ""
    151127
    152 #: widgets/upcoming_mass.php:16
     128#: widgets/upcoming_mass.php:15
    153129msgid "Upcoming Masses"
    154130msgstr ""
    155131
    156 #: widgets/upcoming_mass.php:73
     132#: widgets/upcoming_mass.php:76
    157133msgid "Next Masses"
    158134msgstr ""
    159135
    160 #: widgets/upcoming_mass.php:81
     136#: widgets/upcoming_mass.php:85
    161137msgid "Title:"
    162138msgstr ""
    163139
    164 #: widgets/upcoming_mass.php:85
     140#: widgets/upcoming_mass.php:89
    165141msgid "Subtitle:"
    166142msgstr ""
    167143
    168 #: widgets/upcoming_mass.php:89
     144#: widgets/upcoming_mass.php:93
    169145msgid "Church:"
    170146msgstr ""
    171147
    172 #: widgets/upcoming_mass.php:93
     148#: widgets/upcoming_mass.php:97
    173149msgid "All churches:"
    174150msgstr ""
    175151
    176 #: widgets/upcoming_mass.php:102
     152#: widgets/upcoming_mass.php:106
    177153msgid "Count:"
    178154msgstr ""
    179155
    180 #: widgets/upcoming_mass.php:113
     156#: widgets/upcoming_mass.php:117
     157msgid "Page:"
     158msgstr ""
     159
     160#: widgets/upcoming_mass.php:128
    181161msgid "Show title:"
    182162msgstr ""
    183163
    184 #: widgets/upcoming_mass.php:118 widgets/upcoming_mass.php:129
     164#: widgets/upcoming_mass.php:133 widgets/upcoming_mass.php:144
    185165msgid "No"
    186166msgstr ""
    187167
    188 #: widgets/upcoming_mass.php:118 widgets/upcoming_mass.php:129
     168#: widgets/upcoming_mass.php:133 widgets/upcoming_mass.php:144
    189169msgid "Yes"
    190170msgstr ""
    191171
    192 #: widgets/upcoming_mass.php:124
     172#: widgets/upcoming_mass.php:139
    193173msgid "Show attendees:"
    194174msgstr ""

  • promissa/trunk/promissa.php

    r2207376 r2212778  
    44    Plugin URI: https://www.promissa.nl/plugins/wordpress
    55    Description: This plugin will give you shortcodes and widgets with the latest masses and events of Pro Missa.
    6     Version: 1.2.5
     6    Version: 1.2.6
    77    Author: Kerk en IT
    88    Author URI: https://www.kerkenit.nl
    … …  
    4343                __('Pro Missa', 'promissa'),
    4444                'manage_options',
    45                 PROMISSA_BASENAME,
     45                'promissa',
    4646                'promissa_settings_render_list_page' );
    4747

  • promissa/trunk/readme.txt

    r2207376 r2212778  
    88Tags: kerk, vieringen, mistijden, kerkgebouwen, ledenadministratie, roosters
    99Requires at least: 5.2.1
    10 Tested up to: 5.3
    11 Stable tag: 1.2.5
     10Tested up to: 5.3.1
     11Stable tag: 1.2.6
    1212Requires PHP: 5.2.4
    1313Requires at least: 4.6
    … …  
    8181== Changelog ==
    8282
     83= 1.2.6 =
     84
     85* Added paging in upcomming masses widget
     86* Bugfixes
     87
    8388= 1.2.5 =
    8489

  • promissa/trunk/shortcodes/upcoming_mass.php

    r2207376 r2212778  
    88            'subtitle' => '',
    99            'limit' => 10,
     10            'page' => 0,
    1011            'show_title' => 'false',
    1112            'show_attendees' => 'false',
    … …  
    1516        $single_church = (isset($church_id) && !empty($church_id));
    1617        $masses = NULL;
    17 
     18        $offset = '';
     19        if($page != NULL && !empty($page) && is_numeric($page) && (int)$page > 0) :
     20            $offset = '&page=' . (string)$page . '%2C' . (string)$limit;
     21        endif;
    1822        if($single_church) :
    19             $masses = ProMissaREST('Schedule', '?size=' . $limit . '&filter=church_ID,eq,' . $church_id);
     23            $masses = ProMissaREST('Schedule', '?size=' . $limit . $offset . '&filter=church_ID,eq,' . $church_id);
    2024        else :
    21             $masses = ProMissaREST('Schedule', '?size=' . $limit);
     25            $masses = ProMissaREST('Schedule', '?size=' . $limit . $offset);
    2226        endif;
    2327        $output = '';
    … …  
    6569                    $output .= sprintf('<strong>%s</strong><br />', ($date->format('Y-m-d') == date('Y-m-d') ? __('Today', 'promissa') : (IsTomorrow($mass['start']) ? __('Tomorrow', 'promissa') : (WithinNextWeek($mass['start']) ? __('Upcoming', 'promissa') . ' ' .  getDayOfWeek($date->format('N')) : ucfirst($dateFormatter->format($date))))));
    6670                endif;
    67                 $day .= sprintf('%s<em> %s %s%s</em><br />', (!$single_church ? $mass['church'] : ''), __('at', 'promissa'), getTimeOfDayOfWeek($date->format('H'), $date->format('i')), Locale::getDefault() == 'nl_NL' ? ' ' . __('hour', 'promissa') : '');
     71                $day .= sprintf('%1$s<em> %2$s %3$02d:%4$02d%5$s</em><br />',
     72
     73
     74                //
     75                (!$single_church ? $mass['church'] : ''), //1
     76                __('at', 'promissa'), //2
     77                $date->format('H'), $date->format('i'), //3 //4
     78                Locale::getDefault() == 'nl_NL' ? ' ' . __('hour', 'promissa') : '' //5
     79                );
    6880                $dayOfWeek = $date->format('N');
    6981

  • promissa/trunk/widgets/upcoming_mass.php

    r2207376 r2212778  
    2222        $subtitle = '';
    2323        $limit = '';
     24        $page = '';
    2425        $show_title = '';
    2526        $show_attendees = '';
    … …  
    3031            $limit = sprintf(' limit="%s"', $instance['limit']);
    3132        endif;
     33        if ( ! empty( $instance['page'] ) ) :
     34            $page = sprintf(' page="%s"', $instance['page']);
     35        endif;
    3236        if ( ! empty( $instance['show_title'] ) ) :
    3337            $show_title = sprintf(' show_title="%s"', (((int)$instance['show_title']) == 1 ? 'true' : 'false'));
    … …  
    3741        endif;
    3842        if(isset($instance['church_ID']) && !empty($instance['church_ID'])) :
    39             return '[promissa-upcoming-masses church_id="' . $instance['church_ID'] . '"' . $subtitle . $limit . $show_title . $show_attendees . ']';
     43            return '[promissa-upcoming-masses church_id="' . $instance['church_ID'] . '"' . $subtitle . $limit . $page . $show_title . $show_attendees . ']';
    4044        else :
    41             return '[promissa-upcoming-masses' . $subtitle. $limit . $show_title . $show_attendees . ']';
     45            return '[promissa-upcoming-masses' . $subtitle. $limit . $page . $show_title . $show_attendees . ']';
    4246        endif;
    4347        return '';
    … …  
    7478        $church_ID = ! empty( $instance['church_ID'] ) ? $instance['church_ID'] : '0';
    7579        $limit = ! empty( $instance['limit'] ) ? $instance['limit'] : 10;
     80        $page = ! empty( $instance['page'] ) ? $instance['page'] : 0;
    7681        $show_title = ! empty( $instance['show_title'] ) ? $instance['show_title'] : 0;
    7782        $show_attendees = ! empty( $instance['show_attendees'] ) ? $instance['show_attendees'] : 0;
    … …  
    105110            for($i = 1; $i <=15; $i++) {
    106111                echo '<option value="' . $i . '"' . ((int)esc_attr( $limit ) == $i ? ' selected="selected"' : '') . '>' . $i . '</option>';
     112            }
     113            echo '</select>';
     114        ?>
     115        </p>
     116        <p>
     117        <label for="<?php echo $this->get_field_id( 'page' ); ?>"><?php _e( 'Page:', 'promissa' ); ?></label>
     118        <?php
     119            echo '<select class="widefat" id="' . $this->get_field_id( 'page' ) . '" name="' . $this->get_field_name( 'page' ) . '">';
     120
     121            for($i = 1; $i <=15; $i++) {
     122                echo '<option value="' . $i . '"' . ((int)esc_attr( $page ) == $i ? ' selected="selected"' : '') . '>' . $i . '</option>';
    107123            }
    108124            echo '</select>';
    … …  
    155171        $instance['church_ID'] = ( ! empty( $new_instance['church_ID'] ) ) ? strip_tags( $new_instance['church_ID'] ) : '';
    156172        $instance['limit'] = ( ! empty( $new_instance['limit'] ) ) ? strip_tags( $new_instance['limit'] ) : 10;
     173        $instance['page'] = ( ! empty( $new_instance['page'] ) ) ? strip_tags( $new_instance['page'] ) : 0;
    157174        $instance['show_title'] = ( ! empty( $new_instance['show_title'] ) ) ? strip_tags( $new_instance['show_title'] ) : 0;
    158175        $instance['show_attendees'] = ( ! empty( $new_instance['show_attendees'] ) ) ? strip_tags( $new_instance['show_attendees'] ) : 0;
Note: See TracChangeset for help on using the changeset viewer.