Skip to content

Commit

Permalink
Merge pull request #4263 from dregad/grammar
Browse files Browse the repository at this point in the history
Grammar: removed on, not removed in (date)
  • Loading branch information
splitbrain committed Apr 11, 2024
2 parents 0f0ec3b + 606abce commit 38a55ff
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 28 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/deletedFiles.yml
Expand Up @@ -2,8 +2,8 @@
# It compares the current master with the data/deleted.files file and cleans the file from any re-introduced files.
# It compares the current master with the stable branch and adds all deleted files to the data/deleted.files file
# unless they are already listed there or are excluded from the release archives (export-ignore in .gitattributes).
# Any additions are made to the top of the list with a single trailing line before the first "# removed in" line.
# Finally, the list of newly removed entries receives a header "# removed in $(date -I)" with the current ISO date.
# Any additions are made to the top of the list with a single trailing line before the first "# removed on" line.
# Finally, the list of newly removed entries receives a header "# removed on $(date -I)" with the current ISO date.

name: "Update deleted files"
on:
Expand Down Expand Up @@ -40,13 +40,13 @@ jobs:
continue
fi
if ( ! test -f "data/deleted.files.tmp"); then
awk -v "input=# newly removed" '/# removed in/ && !found {print input; found=1} 1' data/deleted.files > data/deleted.files.tmp && cp data/deleted.files{.tmp,}
awk -v "input=# newly removed" '/# removed on/ && !found {print input; found=1} 1' data/deleted.files > data/deleted.files.tmp && cp data/deleted.files{.tmp,}
fi
awk -v "input=$F" '/# removed in/ && !found {print input; found=1} 1' data/deleted.files > data/deleted.files.tmp && cp data/deleted.files{.tmp,}
awk -v "input=$F" '/# removed on/ && !found {print input; found=1} 1' data/deleted.files > data/deleted.files.tmp && cp data/deleted.files{.tmp,}
done
if (test -f "data/deleted.files.tmp"); then
awk '/# removed in/ && !found {printf("\n"); found=1} 1' data/deleted.files > data/deleted.files.tmp && mv data/deleted.files{.tmp,}
sed -i "s/^# newly removed/# removed in $(date -I)/" data/deleted.files
awk '/# removed on/ && !found {printf("\n"); found=1} 1' data/deleted.files > data/deleted.files.tmp && mv data/deleted.files{.tmp,}
sed -i "s/^# newly removed/# removed on $(date -I)/" data/deleted.files
fi
- name: Create Pull Request
Expand Down
44 changes: 22 additions & 22 deletions data/deleted.files
Expand Up @@ -2,7 +2,7 @@
# but were removed later. An up to date DokuWiki should not have any of
# the files installed

# removed in 2022-06-26
# removed on 2022-06-26
.travis.yml
appveyor.yml
inc/IXR_Library.php
Expand Down Expand Up @@ -90,7 +90,7 @@ lib/images/smileys/icon_lol.gif
lib/images/smileys/fixme.gif
lib/images/smileys/delete.gif

# removed in 2020-06-01
# removed on 2020-06-01
inc/PluginInterface.php
inc/PluginTrait.php
inc/HTTPClient.php
Expand Down Expand Up @@ -216,7 +216,7 @@ lib/plugins/config/settings/extra.class.php
lib/plugins/styling/iris.js
lib/scripts/jquery/jquery-migrate.min.js

# removed in 2018-04-22
# removed on 2018-04-22
data/security.png
data/security.xcf
inc/EmailAddressValidator.php
Expand Down Expand Up @@ -247,11 +247,11 @@ lib/scripts/jquery/jquery-ui.js
lib/scripts/jquery/jquery.js
lib/tpl/dokuwiki/css/_admin.css

# removed in 2016-06-26
# removed on 2016-06-26
inc/cliopts.php
lib/tpl/dokuwiki/css/mixins.less

# removed in 2015-08-10
# removed on 2015-08-10
inc/TarLib.class.php
inc/geshi.php
inc/geshi/4cs.php
Expand Down Expand Up @@ -484,7 +484,7 @@ lib/scripts/drag.js
lib/scripts/jquery/jquery-ui-theme/images/animated-overlay.gif
lib/scripts/tw-sack.js

# removed in 2014-05-05
# removed on 2014-05-05
lib/images/fileicons/audio.png
lib/plugins/plugin/admin.php
lib/plugins/plugin/classes/ap_delete.class.php
Expand Down Expand Up @@ -598,7 +598,7 @@ lib/plugins/plugin/lang/zh/lang.php
lib/plugins/plugin/plugin.info.txt
lib/plugins/plugin/style.css

# removed in 2013-11-18
# removed on 2013-11-18
lib/images/arrow_down.gif
lib/images/arrow_up.gif
lib/images/at.gif
Expand All @@ -609,7 +609,7 @@ lib/images/list-minus.gif
lib/images/list-plus.gif
lib/images/pencil.png

# removed in 2013-10-28
# removed on 2013-10-28
lib/images/interwiki/meatball.gif
lib/images/interwiki/wiki.gif
lib/plugins/acl/ajax.php
Expand Down Expand Up @@ -660,10 +660,10 @@ lib/tpl/dokuwiki/css/mobile.css
lib/tpl/dokuwiki/css/pagetools.css
lib/tpl/dokuwiki/css/structure.css

# removed in 2013-05-10
# removed on 2013-05-10
lib/plugins/info/lang/sl/lang.php

# removed in 2013-04-06
# removed on 2013-04-06
inc/adLDAP.php
inc/auth/ad.class.php
inc/auth/basic.class.php
Expand All @@ -672,15 +672,15 @@ inc/auth/mysql.class.php
inc/auth/pgsql.class.php
inc/auth/plain.class.php

# removed in 2012-09-10
# removed on 2012-09-10
lib/images/icon-file.png
lib/images/icon-thumb.png
lib/images/interwiki/skype.png
lib/plugins/acl/rtl.css
lib/plugins/config/rtl.css
lib/plugins/plugin/rtl.css

# removed in 2011-11-10
# removed on 2011-11-10
lib/_fla/.htaccess
lib/_fla/MultipleUpload.as
lib/_fla/README
Expand All @@ -692,11 +692,11 @@ lib/scripts/ajax.js
lib/scripts/events.js
lib/scripts/subscriptions.js

# removed in 2011-05-25
# removed on 2011-05-25
conf/words.aspell.dist
lib/styles/style.css

# removed in 2010-11-07
# removed on 2010-11-07
inc/lang/ar/subscribermail.txt
inc/lang/az/subscribermail.txt
inc/lang/bg/subscribermail.txt
Expand Down Expand Up @@ -744,7 +744,7 @@ inc/lang/uk/subscribermail.txt
inc/lang/zh/subscribermail.txt
inc/lang/zh-tw/subscribermail.txt

# removed in rc2010-10-07
# removed on rc2010-10-07
conf/msg
inc/lang/bg/wordblock.txt
inc/lang/ca-valencia/wordblock.txt
Expand Down Expand Up @@ -795,7 +795,7 @@ inc/lang/zh-tw/wordblock.txt
inc/lang/zh/wordblock.txt
lib/scripts/pngbehavior.htc

# removed in rc2009-12-02
# removed on rc2009-12-02
inc/lang/ar/wordblock.txt
inc/lang/ca-va/
lib/plugins/acl/lang/ca-va/
Expand All @@ -805,11 +805,11 @@ lib/plugins/popularity/lang/ca-va/
lib/plugins/revert/lang/ca-va/
lib/plugins/usermanager/lang/ca-va/

# removed in rc2009-01-30
# removed on rc2009-01-30
lib/plugins/upgradeplugindirectory
lib/plugins/upgradeplugindirectory/action.php

# removed in rc2009-01-26
# removed on rc2009-01-26
inc/auth/punbb.class.php
inc/lang/ko/edit.txt_bak
inc/lang/ko/lang.php_bak
Expand All @@ -823,7 +823,7 @@ lib/plugins/usermanager/images/no_user_edit.png
lib/plugins/usermanager/images/user_edit.png
lib/tpl/default/UWEB.css

# removed in rc2008-03-31
# removed on rc2008-03-31
inc/aspell.php
inc/geshi/css-gen.cfg
inc/lang/fr/admin_acl.txt
Expand Down Expand Up @@ -869,7 +869,7 @@ lib/plugins/acl/lang/zh-tw/intro.txt
lib/scripts/spellcheck.js
lib/styles/spellcheck.css

# removed in 2007-06-26
# removed on 2007-06-26
inc/parser/wiki.php
lib/images/interwiki/bug.gif
lib/plugins/base.php
Expand All @@ -879,7 +879,7 @@ lib/plugins/plugin/inc/zip.lib.php
lib/scripts/domLib.js
lib/scripts/domTT.js

# removed in 2006-11-06
# removed on 2006-11-06
inc/admin_acl.php
inc/magpie
inc/magpie/rss_cache.inc
Expand All @@ -891,7 +891,7 @@ lib/tpl/default/mediaedit.php
lib/tpl/default/media.php
lib/tpl/default/mediaref.php

# removed in 2006-03-09
# removed on 2006-03-09
data/pages/wiki/playground.txt
inc/auth/ldap.php
inc/auth/mysql.php
Expand Down

0 comments on commit 38a55ff

Please sign in to comment.