From 0c2c3ec8621f3a12c5c1872125c4b53e7aea3b99 Mon Sep 17 00:00:00 2001 From: Diogo Cordeiro Date: Mon, 12 Aug 2019 15:03:30 +0100 Subject: [PATCH] [CORE] Plugin API now extends a new Module API --- DOCUMENTATION/DEVELOPERS/Plugins/README.md | 4 +- actions/version.php | 2 +- lib/framework.php | 1 + lib/gnusocial.php | 89 ++- lib/modules/ActivityHandlerModule.php | 640 ++++++++++++++++++ lib/modules/ActivityVerbHandlerModule.php | 2 +- lib/modules/ActivityVerbHandlerPlugin.php | 82 +++ lib/modules/AuthenticationModule.php | 260 +++++++ ...{MicroAppModule.php => MicroAppPlugin.php} | 2 +- lib/modules/Module.php | 221 ++++++ lib/modules/Plugin.php | 70 +- lib/pluginqueuehandler.php | 6 +- ...{ActivityPlugin.php => ActivityModule.php} | 16 +- .../ActivityModerationModule.php | 214 ++++++ .../locale/ActivityModeration.pot | 2 +- ...yVerbPlugin.php => ActivityVerbModule.php} | 10 +- modules/ActivityVerb/actions/activityverb.php | 2 +- modules/ActivityVerb/locale/ActivityVerb.pot | 4 +- ...tPlugin.php => ActivityVerbPostModule.php} | 12 +- .../locale/ActivityVerbPost.pot | 4 +- ...uthCryptPlugin.php => AuthCryptModule.php} | 14 +- modules/AuthCrypt/README | 6 +- modules/AuthCrypt/locale/AuthCrypt.pot | 4 +- .../locale/af/LC_MESSAGES/AuthCrypt.po | 4 +- .../locale/ar/LC_MESSAGES/AuthCrypt.po | 4 +- .../locale/arz/LC_MESSAGES/AuthCrypt.po | 4 +- .../locale/ast/LC_MESSAGES/AuthCrypt.po | 4 +- .../locale/be-tarask/LC_MESSAGES/AuthCrypt.po | 4 +- .../locale/bg/LC_MESSAGES/AuthCrypt.po | 4 +- .../locale/bn_IN/LC_MESSAGES/AuthCrypt.po | 4 +- .../locale/br/LC_MESSAGES/AuthCrypt.po | 4 +- .../locale/ca/LC_MESSAGES/AuthCrypt.po | 4 +- .../locale/cs/LC_MESSAGES/AuthCrypt.po | 4 +- .../locale/da/LC_MESSAGES/AuthCrypt.po | 4 +- .../locale/de/LC_MESSAGES/AuthCrypt.po | 4 +- .../locale/el/LC_MESSAGES/AuthCrypt.po | 4 +- .../locale/en_GB/LC_MESSAGES/AuthCrypt.po | 4 +- .../locale/eo/LC_MESSAGES/AuthCrypt.po | 4 +- .../locale/es/LC_MESSAGES/AuthCrypt.po | 4 +- .../locale/eu/LC_MESSAGES/AuthCrypt.po | 4 +- .../locale/fa/LC_MESSAGES/AuthCrypt.po | 4 +- .../locale/fi/LC_MESSAGES/AuthCrypt.po | 4 +- .../locale/fr/LC_MESSAGES/AuthCrypt.po | 4 +- .../locale/fur/LC_MESSAGES/AuthCrypt.po | 4 +- .../locale/gl/LC_MESSAGES/AuthCrypt.po | 4 +- .../locale/he/LC_MESSAGES/AuthCrypt.po | 4 +- .../locale/hsb/LC_MESSAGES/AuthCrypt.po | 4 +- .../locale/hu/LC_MESSAGES/AuthCrypt.po | 4 +- .../locale/hy_AM/LC_MESSAGES/AuthCrypt.po | 4 +- .../locale/ia/LC_MESSAGES/AuthCrypt.po | 4 +- .../locale/id/LC_MESSAGES/AuthCrypt.po | 4 +- .../locale/io/LC_MESSAGES/AuthCrypt.po | 4 +- .../locale/is/LC_MESSAGES/AuthCrypt.po | 4 +- .../locale/it/LC_MESSAGES/AuthCrypt.po | 4 +- .../locale/ja/LC_MESSAGES/AuthCrypt.po | 4 +- .../locale/ka/LC_MESSAGES/AuthCrypt.po | 4 +- .../locale/ko/LC_MESSAGES/AuthCrypt.po | 4 +- .../locale/ksh/LC_MESSAGES/AuthCrypt.po | 4 +- .../locale/lb/LC_MESSAGES/AuthCrypt.po | 4 +- .../locale/lt/LC_MESSAGES/AuthCrypt.po | 4 +- .../locale/lv/LC_MESSAGES/AuthCrypt.po | 4 +- .../locale/mg/LC_MESSAGES/AuthCrypt.po | 4 +- .../locale/mk/LC_MESSAGES/AuthCrypt.po | 4 +- .../locale/ml/LC_MESSAGES/AuthCrypt.po | 4 +- .../locale/ms/LC_MESSAGES/AuthCrypt.po | 4 +- .../locale/my/LC_MESSAGES/AuthCrypt.po | 4 +- .../locale/nb/LC_MESSAGES/AuthCrypt.po | 4 +- .../locale/ne/LC_MESSAGES/AuthCrypt.po | 4 +- .../locale/nl/LC_MESSAGES/AuthCrypt.po | 4 +- .../locale/nn/LC_MESSAGES/AuthCrypt.po | 4 +- .../locale/pl/LC_MESSAGES/AuthCrypt.po | 4 +- .../locale/pt/LC_MESSAGES/AuthCrypt.po | 4 +- .../locale/pt_BR/LC_MESSAGES/AuthCrypt.po | 4 +- .../locale/ro_RO/LC_MESSAGES/AuthCrypt.po | 4 +- .../locale/ru/LC_MESSAGES/AuthCrypt.po | 4 +- .../locale/sl/LC_MESSAGES/AuthCrypt.po | 4 +- .../locale/sr-ec/LC_MESSAGES/AuthCrypt.po | 4 +- .../locale/sv/LC_MESSAGES/AuthCrypt.po | 4 +- .../locale/ta/LC_MESSAGES/AuthCrypt.po | 4 +- .../locale/te/LC_MESSAGES/AuthCrypt.po | 4 +- .../locale/tl/LC_MESSAGES/AuthCrypt.po | 4 +- .../locale/tr/LC_MESSAGES/AuthCrypt.po | 4 +- .../locale/uk/LC_MESSAGES/AuthCrypt.po | 4 +- .../locale/ur_PK/LC_MESSAGES/AuthCrypt.po | 4 +- .../locale/vi/LC_MESSAGES/AuthCrypt.po | 4 +- .../locale/zh/LC_MESSAGES/AuthCrypt.po | 4 +- .../locale/zh_CN/LC_MESSAGES/AuthCrypt.po | 4 +- .../locale/zh_TW/LC_MESSAGES/AuthCrypt.po | 4 +- ...{FavoritePlugin.php => FavoriteModule.php} | 4 +- .../Favorite/actions/atompubfavoritefeed.php | 2 +- modules/Favorite/locale/Favorite.pot | 16 +- .../locale/af/LC_MESSAGES/Favorite.po | 12 +- .../locale/ar/LC_MESSAGES/Favorite.po | 12 +- .../locale/arz/LC_MESSAGES/Favorite.po | 12 +- .../locale/ast/LC_MESSAGES/Favorite.po | 12 +- .../locale/be-tarask/LC_MESSAGES/Favorite.po | 12 +- .../locale/bg/LC_MESSAGES/Favorite.po | 12 +- .../locale/bn_IN/LC_MESSAGES/Favorite.po | 12 +- .../locale/br/LC_MESSAGES/Favorite.po | 12 +- .../locale/ca/LC_MESSAGES/Favorite.po | 12 +- .../locale/cs/LC_MESSAGES/Favorite.po | 12 +- .../locale/da/LC_MESSAGES/Favorite.po | 12 +- .../locale/de/LC_MESSAGES/Favorite.po | 12 +- .../locale/el/LC_MESSAGES/Favorite.po | 12 +- .../locale/en_GB/LC_MESSAGES/Favorite.po | 12 +- .../locale/eo/LC_MESSAGES/Favorite.po | 12 +- .../locale/es/LC_MESSAGES/Favorite.po | 12 +- .../locale/eu/LC_MESSAGES/Favorite.po | 12 +- .../locale/fa/LC_MESSAGES/Favorite.po | 12 +- .../locale/fi/LC_MESSAGES/Favorite.po | 12 +- .../locale/fr/LC_MESSAGES/Favorite.po | 12 +- .../locale/fur/LC_MESSAGES/Favorite.po | 12 +- .../locale/gl/LC_MESSAGES/Favorite.po | 12 +- .../locale/he/LC_MESSAGES/Favorite.po | 12 +- .../locale/hsb/LC_MESSAGES/Favorite.po | 12 +- .../locale/hu/LC_MESSAGES/Favorite.po | 12 +- .../locale/hy_AM/LC_MESSAGES/Favorite.po | 12 +- .../locale/ia/LC_MESSAGES/Favorite.po | 12 +- .../locale/id/LC_MESSAGES/Favorite.po | 12 +- .../locale/io/LC_MESSAGES/Favorite.po | 12 +- .../locale/is/LC_MESSAGES/Favorite.po | 12 +- .../locale/it/LC_MESSAGES/Favorite.po | 12 +- .../locale/ja/LC_MESSAGES/Favorite.po | 12 +- .../locale/ka/LC_MESSAGES/Favorite.po | 12 +- .../locale/ko/LC_MESSAGES/Favorite.po | 12 +- .../locale/ksh/LC_MESSAGES/Favorite.po | 12 +- .../locale/lb/LC_MESSAGES/Favorite.po | 12 +- .../locale/lt/LC_MESSAGES/Favorite.po | 12 +- .../locale/lv/LC_MESSAGES/Favorite.po | 12 +- .../locale/mg/LC_MESSAGES/Favorite.po | 12 +- .../locale/mk/LC_MESSAGES/Favorite.po | 12 +- .../locale/ml/LC_MESSAGES/Favorite.po | 12 +- .../locale/ms/LC_MESSAGES/Favorite.po | 12 +- .../locale/my/LC_MESSAGES/Favorite.po | 12 +- .../locale/nb/LC_MESSAGES/Favorite.po | 12 +- .../locale/ne/LC_MESSAGES/Favorite.po | 12 +- .../locale/nl/LC_MESSAGES/Favorite.po | 12 +- .../locale/nn/LC_MESSAGES/Favorite.po | 12 +- .../locale/pl/LC_MESSAGES/Favorite.po | 12 +- .../locale/pt/LC_MESSAGES/Favorite.po | 12 +- .../locale/pt_BR/LC_MESSAGES/Favorite.po | 12 +- .../locale/ro_RO/LC_MESSAGES/Favorite.po | 12 +- .../locale/ru/LC_MESSAGES/Favorite.po | 12 +- .../locale/sl/LC_MESSAGES/Favorite.po | 12 +- .../locale/sr-ec/LC_MESSAGES/Favorite.po | 12 +- .../locale/sv/LC_MESSAGES/Favorite.po | 12 +- .../locale/ta/LC_MESSAGES/Favorite.po | 12 +- .../locale/te/LC_MESSAGES/Favorite.po | 12 +- .../locale/tl/LC_MESSAGES/Favorite.po | 12 +- .../locale/tr/LC_MESSAGES/Favorite.po | 12 +- .../locale/uk/LC_MESSAGES/Favorite.po | 12 +- .../locale/ur_PK/LC_MESSAGES/Favorite.po | 12 +- .../locale/vi/LC_MESSAGES/Favorite.po | 12 +- .../locale/zh/LC_MESSAGES/Favorite.po | 12 +- .../locale/zh_CN/LC_MESSAGES/Favorite.po | 12 +- .../locale/zh_TW/LC_MESSAGES/Favorite.po | 12 +- ...ugin.php => HTMLPurifierSchemesModule.php} | 6 +- .../locale/HTMLPurifierSchemes.pot | 4 +- .../{SharePlugin.php => ShareModule.php} | 4 +- modules/Share/locale/Share.pot | 14 +- .../AccountManager/AccountManagerPlugin.php | 2 +- .../AccountManager/locale/AccountManager.pot | 2 +- plugins/ActivityPub/ActivityPubPlugin.php | 2 +- plugins/ActivitySpam/ActivitySpamPlugin.php | 2 +- plugins/ActivitySpam/locale/ActivitySpam.pot | 2 +- plugins/AnonymousFave/AnonymousFavePlugin.php | 2 +- .../AnonymousFave/locale/AnonymousFave.pot | 32 +- plugins/AntiBrute/AntiBrutePlugin.php | 2 +- plugins/AntiBrute/locale/AntiBrute.pot | 2 +- plugins/ApiLogger/ApiLoggerPlugin.php | 2 +- plugins/ApiLogger/locale/ApiLogger.pot | 2 +- plugins/AutoSandbox/AutoSandboxPlugin.php | 2 +- plugins/AutoSandbox/locale/AutoSandbox.pot | 2 +- plugins/Autocomplete/AutocompletePlugin.php | 2 +- plugins/Autocomplete/locale/Autocomplete.pot | 2 +- plugins/Awesomeness/AwesomenessPlugin.php | 2 +- plugins/Awesomeness/locale/Awesomeness.pot | 2 +- plugins/BitlyUrl/BitlyUrlPlugin.php | 2 +- plugins/BitlyUrl/locale/BitlyUrl.pot | 2 +- plugins/Blacklist/BlacklistPlugin.php | 2 +- plugins/Blacklist/locale/Blacklist.pot | 2 +- plugins/BlankAd/BlankAdPlugin.php | 2 +- plugins/BlankAd/locale/BlankAd.pot | 2 +- plugins/BlogspamNet/BlogspamNetPlugin.php | 2 +- plugins/BlogspamNet/locale/BlogspamNet.pot | 2 +- plugins/Bookmark/BookmarkPlugin.php | 2 +- plugins/Bookmark/locale/Bookmark.pot | 2 +- plugins/CacheLog/CacheLogPlugin.php | 2 +- plugins/CacheLog/locale/CacheLog.pot | 2 +- .../CasAuthenticationPlugin.php | 2 +- .../locale/CasAuthentication.pot | 34 +- plugins/ChooseTheme/ChooseThemePlugin.php | 2 +- plugins/ChooseTheme/locale/ChooseTheme.pot | 2 +- .../ClientSideShortenPlugin.php | 2 +- .../locale/ClientSideShorten.pot | 12 +- plugins/Comet/CometPlugin.php | 2 +- plugins/Comet/locale/Comet.pot | 2 +- .../ConversationTreePlugin.php | 2 +- .../locale/ConversationTree.pot | 2 +- plugins/Cronish/CronishPlugin.php | 2 +- plugins/Cronish/locale/Cronish.pot | 2 +- plugins/DefaultLayout/DefaultLayoutPlugin.php | 2 +- .../DefaultLayout/locale/DefaultLayout.pot | 2 +- plugins/Diaspora/DiasporaPlugin.php | 2 +- plugins/Diaspora/locale/Diaspora.pot | 2 +- plugins/DirectMessage/DirectMessagePlugin.php | 18 +- .../DirectMessage/locale/DirectMessage.pot | 112 ++- .../locale/en_GB/LC_MESSAGES/DirectMessage.po | 2 +- .../DirectionDetectorPlugin.php | 2 +- .../locale/DirectionDetector.pot | 2 +- plugins/Directory/DirectoryPlugin.php | 2 +- plugins/Directory/locale/Directory.pot | 34 +- plugins/DiskCache/DiskCachePlugin.php | 2 +- plugins/DiskCache/locale/DiskCache.pot | 2 +- .../DomainStatusNetworkPlugin.php | 2 +- .../locale/DomainStatusNetwork.pot | 2 +- .../DomainWhitelist/DomainWhitelistPlugin.php | 2 +- .../locale/DomainWhitelist.pot | 2 +- .../EmailAuthenticationPlugin.php | 2 +- .../locale/EmailAuthentication.pot | 2 +- .../EmailRegistrationPlugin.php | 2 +- .../locale/EmailRegistration.pot | 2 +- plugins/EmailReminder/EmailReminderPlugin.php | 2 +- .../EmailReminder/locale/EmailReminder.pot | 2 +- plugins/EmailSummary/EmailSummaryPlugin.php | 2 +- plugins/EmailSummary/locale/EmailSummary.pot | 2 +- plugins/Embed/EmbedPlugin.php | 2 +- plugins/Embed/locale/Embed.pot | 12 +- plugins/Event/EventPlugin.php | 2 +- plugins/Event/actions/newevent.php | 6 +- plugins/Event/classes/Happening.php | 6 +- plugins/Event/locale/Event.pot | 104 +-- .../ExtendedProfile/ExtendedProfilePlugin.php | 2 +- .../locale/ExtendedProfile.pot | 2 +- plugins/FeedPoller/FeedPollerPlugin.php | 2 +- plugins/FeedPoller/locale/FeedPoller.pot | 2 +- plugins/FetchRemote/FetchRemotePlugin.php | 2 +- plugins/FetchRemote/locale/FetchRemote.pot | 2 +- .../FollowEveryone/FollowEveryonePlugin.php | 2 +- .../FollowEveryone/locale/FollowEveryone.pot | 2 +- plugins/ForceGroup/ForceGroupPlugin.php | 2 +- plugins/ForceGroup/locale/ForceGroup.pot | 2 +- .../GNUsocialPhoto/locale/GNUsocialPhoto.pot | 2 +- .../locale/GNUsocialPhotos.pot | 10 +- .../locale/GNUsocialProfileExtensions.pot | 2 +- .../GNUsocialVideo/locale/GNUsocialVideo.pot | 2 +- plugins/GeoURL/GeoURLPlugin.php | 2 +- plugins/GeoURL/locale/GeoURL.pot | 2 +- plugins/Geonames/GeonamesPlugin.php | 2 +- plugins/Geonames/locale/Geonames.pot | 2 +- .../GroupFavorited/GroupFavoritedPlugin.php | 9 +- .../GroupFavorited/locale/GroupFavorited.pot | 26 +- .../GroupPrivateMessagePlugin.php | 2 +- .../locale/GroupPrivateMessage.pot | 48 +- plugins/ImageMagick/ImageMagickPlugin.php | 2 +- plugins/ImageMagick/locale/ImageMagick.pot | 2 +- plugins/Imap/ImapPlugin.php | 2 +- plugins/Imap/locale/Imap.pot | 2 +- plugins/Imap/locale/sv/LC_MESSAGES/Imap.po | 2 +- .../InProcessCache/InProcessCachePlugin.php | 2 +- .../InProcessCache/locale/InProcessCache.pot | 2 +- .../InfiniteScroll/InfiniteScrollPlugin.php | 4 +- .../InfiniteScroll/locale/InfiniteScroll.pot | 6 +- plugins/LRDD/LRDDPlugin.php | 2 +- plugins/LRDD/locale/LRDD.pot | 2 +- .../LdapAuthenticationPlugin.php | 2 +- .../locale/LdapAuthentication.pot | 2 +- .../LdapAuthorizationPlugin.php | 2 +- .../locale/LdapAuthorization.pot | 2 +- plugins/LdapCommon/locale/LdapCommon.pot | 2 +- plugins/LilUrl/LilUrlPlugin.php | 2 +- plugins/LilUrl/locale/LilUrl.pot | 2 +- plugins/LinkPreview/LinkPreviewPlugin.php | 2 +- plugins/LinkPreview/locale/LinkPreview.pot | 2 +- plugins/Linkback/LinkbackPlugin.php | 2 +- plugins/Linkback/locale/Linkback.pot | 68 +- plugins/LogFilter/LogFilterPlugin.php | 2 +- plugins/LogFilter/locale/LogFilter.pot | 2 +- plugins/Mapstraction/MapstractionPlugin.php | 2 +- plugins/Mapstraction/locale/Mapstraction.pot | 2 +- plugins/Memcached/MemcachedPlugin.php | 117 ++-- plugins/Memcached/locale/Memcached.pot | 2 +- plugins/MentionURL/MentionURLPlugin.php | 2 +- plugins/MentionURL/locale/MentionURL.pot | 2 +- plugins/Meteor/MeteorPlugin.php | 2 +- plugins/Meteor/locale/Meteor.pot | 2 +- plugins/MobileProfile/MobileProfilePlugin.php | 2 +- .../MobileProfile/locale/MobileProfile.pot | 2 +- plugins/ModHelper/ModHelperPlugin.php | 2 +- plugins/ModHelper/locale/ModHelper.pot | 2 +- plugins/ModLog/ModLogPlugin.php | 2 +- plugins/ModLog/locale/ModLog.pot | 2 +- plugins/ModPlus/ModPlusPlugin.php | 2 +- plugins/ModPlus/locale/ModPlus.pot | 2 +- plugins/Mollom/MollomPlugin.php | 2 +- plugins/Mollom/locale/Mollom.pot | 2 +- plugins/Nodeinfo/locale/Nodeinfo.pot | 2 +- plugins/NoticeTitle/NoticeTitlePlugin.php | 2 +- plugins/NoticeTitle/locale/NoticeTitle.pot | 2 +- plugins/OStatus/OStatusPlugin.php | 2 +- plugins/OStatus/classes/Magicsig.php | 4 +- plugins/OStatus/lib/magicenvelope.php | 2 +- plugins/OStatus/lib/salmon.php | 2 +- plugins/OStatus/locale/OStatus.pot | 2 +- plugins/OfflineBackup/OfflineBackupPlugin.php | 2 +- .../OfflineBackup/locale/OfflineBackup.pot | 12 +- .../OpenExternalLinkTargetPlugin.php | 2 +- .../locale/OpenExternalLinkTarget.pot | 2 +- plugins/OpenID/OpenIDPlugin.php | 2 +- plugins/OpenID/locale/OpenID.pot | 279 ++++---- plugins/OpenID/openid.php | 2 +- plugins/OpenX/OpenXPlugin.php | 2 +- plugins/OpenX/locale/OpenX.pot | 32 +- plugins/OpenX/locale/fr/LC_MESSAGES/OpenX.po | 2 +- .../OpportunisticQM/OpportunisticQMPlugin.php | 2 +- .../locale/OpportunisticQM.pot | 2 +- plugins/Orbited/OrbitedPlugin.php | 2 +- plugins/Orbited/locale/Orbited.pot | 2 +- .../PiwikAnalytics/PiwikAnalyticsPlugin.php | 2 +- .../PiwikAnalytics/locale/PiwikAnalytics.pot | 2 +- plugins/Poll/PollPlugin.php | 2 +- plugins/Poll/locale/Poll.pot | 2 +- plugins/PostDebug/PostDebugPlugin.php | 2 +- plugins/PostDebug/locale/PostDebug.pot | 2 +- plugins/PtitUrl/PtitUrlPlugin.php | 2 +- plugins/PtitUrl/locale/PtitUrl.pot | 2 +- plugins/QnA/QnAPlugin.php | 2 +- plugins/QnA/locale/QnA.pot | 2 +- plugins/RSSCloud/RSSCloudPlugin.php | 2 +- plugins/RSSCloud/locale/RSSCloud.pot | 2 +- plugins/Realtime/locale/Realtime.pot | 2 +- plugins/RedisCache/RedisCachePlugin.php | 2 +- .../RegisterThrottlePlugin.php | 2 +- .../locale/RegisterThrottle.pot | 2 +- .../RequireValidatedEmailPlugin.php | 2 +- .../locale/RequireValidatedEmail.pot | 2 +- .../ReverseUsernameAuthenticationPlugin.php | 2 +- .../locale/ReverseUsernameAuthentication.pot | 2 +- plugins/SQLProfile/SQLProfilePlugin.php | 2 +- plugins/SQLProfile/locale/SQLProfile.pot | 2 +- plugins/SQLStats/SQLStatsPlugin.php | 2 +- plugins/SQLStats/locale/SQLStats.pot | 2 +- plugins/Sample/SamplePlugin.php | 10 +- plugins/Sample/locale/Sample.pot | 26 +- plugins/SearchSub/SearchSubPlugin.php | 2 +- plugins/SearchSub/locale/SearchSub.pot | 88 +-- .../SensitiveContentPlugin.php | 2 +- .../locale/SensitiveContent.pot | 2 +- plugins/ShareNotice/ShareNoticePlugin.php | 2 +- plugins/ShareNotice/locale/ShareNotice.pot | 2 +- plugins/SimpleCaptcha/SimpleCaptchaPlugin.php | 2 +- .../SimpleCaptcha/locale/SimpleCaptcha.pot | 2 +- plugins/SimpleUrl/SimpleUrlPlugin.php | 2 +- plugins/SimpleUrl/locale/SimpleUrl.pot | 2 +- plugins/Sitemap/SitemapPlugin.php | 2 +- plugins/Sitemap/locale/Sitemap.pot | 2 +- .../SlicedFavorites/SlicedFavoritesPlugin.php | 2 +- .../locale/SlicedFavorites.pot | 12 +- plugins/SphinxSearch/SphinxSearchPlugin.php | 2 +- plugins/SphinxSearch/locale/SphinxSearch.pot | 12 +- .../StoreRemoteMediaPlugin.php | 2 +- .../locale/StoreRemoteMedia.pot | 2 +- .../StrictTransportSecurityPlugin.php | 2 +- .../locale/StrictTransportSecurity.pot | 2 +- plugins/SubMirror/SubMirrorPlugin.php | 2 +- plugins/SubMirror/locale/SubMirror.pot | 44 +- .../SubscriptionThrottlePlugin.php | 2 +- .../locale/SubscriptionThrottle.pot | 2 +- plugins/TabFocus/TabFocusPlugin.php | 2 +- plugins/TabFocus/locale/TabFocus.pot | 2 +- plugins/TagCloud/TagCloudPlugin.php | 2 +- plugins/TagCloud/locale/TagCloud.pot | 24 +- plugins/TagSub/TagSubPlugin.php | 2 +- plugins/TagSub/locale/TagSub.pot | 44 +- plugins/TightUrl/TightUrlPlugin.php | 2 +- plugins/TightUrl/locale/TightUrl.pot | 2 +- plugins/TwitterBridge/TwitterBridgePlugin.php | 2 +- .../TwitterBridge/daemons/twitterdaemon.php | 2 +- .../TwitterBridge/locale/TwitterBridge.pot | 2 +- plugins/UserFlag/UserFlagPlugin.php | 2 +- plugins/UserFlag/locale/UserFlag.pot | 2 +- plugins/UserLimit/UserLimitPlugin.php | 2 +- plugins/UserLimit/locale/UserLimit.pot | 2 +- .../VideoThumbnails/VideoThumbnailsPlugin.php | 2 +- .../locale/VideoThumbnails.pot | 2 +- plugins/WebFinger/WebFingerPlugin.php | 2 +- plugins/WebFinger/locale/WebFinger.pot | 12 +- plugins/WikiHashtags/WikiHashtagsPlugin.php | 2 +- plugins/WikiHashtags/locale/WikiHashtags.pot | 2 +- .../WikiHowProfile/WikiHowProfilePlugin.php | 2 +- .../WikiHowProfile/locale/WikiHowProfile.pot | 2 +- plugins/Xmpp/XmppPlugin.php | 4 +- plugins/Xmpp/locale/Xmpp.pot | 14 +- public/index.php | 1 + scripts/docgen.php | 2 +- scripts/update_po_templates.php | 104 ++- tests/Core/XmppValidateTest.php | 4 +- 397 files changed, 3093 insertions(+), 1450 deletions(-) create mode 100644 lib/modules/ActivityHandlerModule.php create mode 100644 lib/modules/ActivityVerbHandlerPlugin.php create mode 100644 lib/modules/AuthenticationModule.php rename lib/modules/{MicroAppModule.php => MicroAppPlugin.php} (98%) create mode 100644 lib/modules/Module.php rename modules/Activity/{ActivityPlugin.php => ActivityModule.php} (97%) create mode 100644 modules/ActivityModeration/ActivityModerationModule.php rename modules/ActivityVerb/{ActivityVerbPlugin.php => ActivityVerbModule.php} (90%) rename modules/ActivityVerbPost/{ActivityVerbPostPlugin.php => ActivityVerbPostModule.php} (91%) rename modules/AuthCrypt/{AuthCryptPlugin.php => AuthCryptModule.php} (95%) rename modules/Favorite/{FavoritePlugin.php => FavoriteModule.php} (99%) rename modules/HTMLPurifierSchemes/{HTMLPurifierSchemesPlugin.php => HTMLPurifierSchemesModule.php} (89%) rename modules/Share/{SharePlugin.php => ShareModule.php} (99%) diff --git a/DOCUMENTATION/DEVELOPERS/Plugins/README.md b/DOCUMENTATION/DEVELOPERS/Plugins/README.md index 418cdb39e3..4e3b71fe23 100644 --- a/DOCUMENTATION/DEVELOPERS/Plugins/README.md +++ b/DOCUMENTATION/DEVELOPERS/Plugins/README.md @@ -223,10 +223,10 @@ function onEndPrimaryNav($action) return true; } -function onPluginVersion(&$versions) +public function onPluginVersion(&$versions): bool { $versions[] = array('name' => 'Sample', - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Brion Vibber, Evan Prodromou', 'homepage' => 'http://example.org/plugin', 'rawdescription' => diff --git a/actions/version.php b/actions/version.php index 4a62fe2f04..5fd0c3cfa3 100644 --- a/actions/version.php +++ b/actions/version.php @@ -72,7 +72,7 @@ class VersionAction extends Action { parent::prepare($args); - Event::handle('PluginVersion', array(&$this->pluginVersions)); + Event::handle('PluginVersion', [&$this->pluginVersions]); return true; } diff --git a/lib/framework.php b/lib/framework.php index 5135faef23..928383a5fe 100644 --- a/lib/framework.php +++ b/lib/framework.php @@ -106,6 +106,7 @@ require_once INSTALLDIR . '/lib/language.php'; // can use it require_once INSTALLDIR . '/lib/event.php'; +require_once INSTALLDIR . '/lib/modules/Module.php'; require_once INSTALLDIR . '/lib/modules/Plugin.php'; function addPlugin($name, array $attrs = []) diff --git a/lib/gnusocial.php b/lib/gnusocial.php index 0d98fa8093..6f3db149f9 100644 --- a/lib/gnusocial.php +++ b/lib/gnusocial.php @@ -27,10 +27,66 @@ class GNUsocial protected static $have_config; protected static $is_api; protected static $is_ajax; - protected static $plugins = []; + protected static $modules = []; /** - * Configure and instantiate a plugin (or a core module) into the current configuration. + * Configure and instantiate a core module into the current configuration. + * Class definitions will be loaded from standard paths if necessary. + * Note that initialization events won't be fired until later. + * + * @param string $name class name & module file/subdir name + * @param array $attrs key/value pairs of public attributes to set on module instance + * + * @return bool + * @throws ServerException if module can't be found + */ + public static function addModule(string $name, array $attrs = []) + { + $name = ucfirst($name); + + if (isset(self::$modules[$name])) { + // We have already loaded this module. Don't try to + // do it again with (possibly) different values. + // Försten till kvarn får mala. + return true; + } + + $moduleclass = "{$name}Module"; + + if (!class_exists($moduleclass)) { + + $files = [ + "modules/{$moduleclass}.php", + "modules/{$name}/{$moduleclass}.php" + ]; + + foreach ($files as $file) { + $fullpath = INSTALLDIR . '/' . $file; + if (@file_exists($fullpath)) { + include_once $fullpath; + break; + } + } + if (!class_exists($moduleclass)) { + throw new ServerException("Module $name not found.", 500); + } + } + + // Doesn't this $inst risk being garbage collected or something? + // TODO: put into a static array that makes sure $inst isn't lost. + $inst = new $moduleclass(); + foreach ($attrs as $aname => $avalue) { + $inst->$aname = $avalue; + } + + // Record activated modules for later display/config dump + self::$modules[$name] = $attrs; + + return true; + } + + /** + * Configure and instantiate a plugin into the current configuration. * Class definitions will be loaded from standard paths if necessary. * Note that initialization events won't be fired until later. * @@ -44,7 +100,7 @@ class GNUsocial { $name = ucfirst($name); - if (isset(self::$plugins[$name])) { + if (isset(self::$modules[$name])) { // We have already loaded this module. Don't try to // do it again with (possibly) different values. // Försten till kvarn får mala. @@ -58,8 +114,6 @@ class GNUsocial $files = [ "local/plugins/{$moduleclass}.php", "local/plugins/{$name}/{$moduleclass}.php", - "modules/{$moduleclass}.php", - "modules/{$name}/{$moduleclass}.php", "plugins/{$moduleclass}.php", "plugins/{$name}/{$moduleclass}.php" ]; @@ -67,7 +121,7 @@ class GNUsocial foreach ($files as $file) { $fullpath = INSTALLDIR . '/' . $file; if (@file_exists($fullpath)) { - include_once($fullpath); + include_once $fullpath; break; } } @@ -84,7 +138,7 @@ class GNUsocial } // Record activated modules for later display/config dump - self::$plugins[$name] = $attrs; + self::$modules[$name] = $attrs; return true; } @@ -93,8 +147,8 @@ class GNUsocial { // Remove our module if it was previously loaded $name = ucfirst($name); - if (isset(self::$plugins[$name])) { - unset(self::$plugins[$name]); + if (isset(self::$modules[$name])) { + unset(self::$modules[$name]); } // make sure initPlugins will avoid this @@ -107,9 +161,9 @@ class GNUsocial * Get a list of activated modules in this process. * @return array of (string $name, array $args) pairs */ - public static function getActivePlugins() + public static function getActiveModules() { - return self::$plugins; + return self::$modules; } /** @@ -145,7 +199,7 @@ class GNUsocial self::fillConfigVoids(); self::verifyLoadedConfig(); - self::initPlugins(); + self::initModules(); } /** @@ -206,9 +260,9 @@ class GNUsocial } /** - * Fire initialization events for all instantiated plugins. + * Fire initialization events for all instantiated modules. */ - protected static function initPlugins() + protected static function initModules() { // User config may have already added some of these modules, with // maybe configured parameters. The self::addModule function will @@ -216,7 +270,7 @@ class GNUsocial // Load core modules foreach (common_config('plugins', 'core') as $name => $params) { - call_user_func('self::addPlugin', $name, $params); + call_user_func('self::addModule', $name, $params); } // Load default plugins @@ -245,7 +299,8 @@ class GNUsocial Event::handle('CheckSchema'); } - // Give modules a chance to initialize in a fully-prepared environment + // Give modules and plugins a chance to initialize in a fully-prepared environment + Event::handle('InitializeModule'); Event::handle('InitializePlugin'); } @@ -310,7 +365,7 @@ class GNUsocial global $_server, $_path, $config, $_PEAR; Event::clearHandlers(); - self::$plugins = []; + self::$modules = []; // try to figure out where we are. $server and $path // can be set by including module, else we guess based diff --git a/lib/modules/ActivityHandlerModule.php b/lib/modules/ActivityHandlerModule.php new file mode 100644 index 0000000000..1daf5751f3 --- /dev/null +++ b/lib/modules/ActivityHandlerModule.php @@ -0,0 +1,640 @@ +. + */ + +if (!defined('GNUSOCIAL')) { exit(1); } + +/** + * Superclass for plugins which add Activity types and such + * + * @category Activity + * @package GNUsocial + * @author Mikael Nordfeldth + * @copyright 2014 Free Software Foundation, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0 + * @link http://gnu.io/social + */ +abstract class ActivityHandlerModule extends Module +{ + /** + * Returns a key string which represents this activity in HTML classes, + * ids etc, as when offering selection of what type of post to make. + * In MicroAppPlugin, this is paired with the user-visible localizable appTitle(). + * + * @return string (compatible with HTML classes) + */ + abstract function tag(); + + /** + * Return a list of ActivityStreams object type IRIs + * which this micro-app handles. Default implementations + * of the base class will use this list to check if a + * given ActivityStreams object belongs to us, via + * $this->isMyNotice() or $this->isMyActivity. + * + * An empty list means any type is ok. (Favorite verb etc.) + * + * @return array of strings + */ + abstract function types(); + + /** + * Return a list of ActivityStreams verb IRIs which + * this micro-app handles. Default implementations + * of the base class will use this list to check if a + * given ActivityStreams verb belongs to us, via + * $this->isMyNotice() or $this->isMyActivity. + * + * All micro-app classes must override this method. + * + * @return array of strings + */ + public function verbs() { + return array(ActivityVerb::POST); + } + + /** + * Check if a given ActivityStreams activity should be handled by this + * micro-app plugin. + * + * The default implementation checks against the activity type list + * returned by $this->types(), and requires that exactly one matching + * object be present. You can override this method to expand + * your checks or to compare the activity's verb, etc. + * + * @param Activity $activity + * @return boolean + */ + function isMyActivity(Activity $act) { + return (count($act->objects) == 1 + && ($act->objects[0] instanceof ActivityObject) + && $this->isMyVerb($act->verb) + && $this->isMyType($act->objects[0]->type)); + } + + /** + * Check if a given notice object should be handled by this micro-app + * plugin. + * + * The default implementation checks against the activity type list + * returned by $this->types(). You can override this method to expand + * your checks, but follow the execution chain to get it right. + * + * @param Notice $notice + * @return boolean + */ + function isMyNotice(Notice $notice) { + return $this->isMyVerb($notice->verb) && $this->isMyType($notice->object_type); + } + + function isMyVerb($verb) { + $verb = $verb ?: ActivityVerb::POST; // post is the default verb + return ActivityUtils::compareVerbs($verb, $this->verbs()); + } + + function isMyType($type) { + // Third argument to compareTypes is true, to allow for notices with empty object_type for example (verb-only) + return count($this->types())===0 || ActivityUtils::compareTypes($type, $this->types()); + } + + /** + * Given a parsed ActivityStreams activity, your plugin + * gets to figure out how to actually save it into a notice + * and any additional data structures you require. + * + * This function is deprecated and in the future, Notice::saveActivity + * should be called from onStartHandleFeedEntryWithProfile in this class + * (which instead turns to saveObjectFromActivity). + * + * @param Activity $activity + * @param Profile $actor + * @param array $options=array() + * + * @return Notice the resulting notice + */ + public function saveNoticeFromActivity(Activity $activity, Profile $actor, array $options=array()) + { + // Any plugin which has not implemented saveObjectFromActivity _must_ + // override this function until they are migrated (this function will + // be deleted when all plugins are migrated to saveObjectFromActivity). + + if (isset($this->oldSaveNew)) { + throw new ServerException('A function has been called for new saveActivity functionality, but is still set with an oldSaveNew configuration'); + } + + return Notice::saveActivity($activity, $actor, $options); + } + + /** + * Given a parsed ActivityStreams activity, your plugin gets + * to figure out itself how to store the additional data into + * the database, besides the base data stored by the core. + * + * This will handle just about all events where an activity + * object gets saved, whether it is via AtomPub, OStatus + * (WebSub and Salmon transports), or ActivityStreams-based + * backup/restore of account data. + * + * You should be able to accept as input the output from an + * asActivity() call on the stored object. Where applicable, + * try to use existing ActivityStreams structures and object + * types, and be liberal in accepting input from what might + * be other compatible apps. + * + * All micro-app classes must override this method. + * + * @fixme are there any standard options? + * + * @param Activity $activity + * @param Notice $stored The notice in our database for this certain object + * @param array $options=array() + * + * @return object If the verb handling plugin creates an object, it can be returned here (otherwise true) + * @throws exception On any error. + */ + protected function saveObjectFromActivity(Activity $activity, Notice $stored, array $options=array()) + { + throw new ServerException('This function should be abstract when all plugins have migrated to saveObjectFromActivity'); + } + + /* + * This usually gets called from Notice::saveActivity after a Notice object has been created, + * so it contains a proper id and a uri for the object to be saved. + */ + public function onStoreActivityObject(Activity $act, Notice $stored, array $options, &$object) { + // $this->oldSaveNew is there during a migration period of plugins, to start using + // Notice::saveActivity instead of Notice::saveNew + if (!$this->isMyActivity($act) || isset($this->oldSaveNew)) { + return true; + } + $object = $this->saveObjectFromActivity($act, $stored, $options); + return false; + } + + /** + * Given an existing Notice object, your plugin gets to + * figure out how to arrange it into an ActivityStreams + * object. + * + * This will be how your specialized notice gets output in + * Atom feeds and JSON-based ActivityStreams output, including + * account backup/restore and OStatus (WebSub and Salmon transports). + * + * You should be able to round-trip data from this format back + * through $this->saveNoticeFromActivity(). Where applicable, try + * to use existing ActivityStreams structures and object types, + * and consider interop with other compatible apps. + * + * All micro-app classes must override this method. + * + * @fixme this outputs an ActivityObject, not an Activity. Any compat issues? + * + * @param Notice $notice + * + * @return ActivityObject + */ + abstract function activityObjectFromNotice(Notice $notice); + + /** + * When a notice is deleted, you'll be called here for a chance + * to clean up any related resources. + * + * All micro-app classes must override this method. + * + * @param Notice $notice + */ + abstract function deleteRelated(Notice $notice); + + protected function notifyMentioned(Notice $stored, array &$mentioned_ids) + { + // pass through silently by default + + // If we want to stop any other plugin from notifying based on this activity, return false instead. + return true; + } + + /** + * Called when generating Atom XML ActivityStreams output from an + * ActivityObject belonging to this plugin. Gives the plugin + * a chance to add custom output. + * + * Note that you can only add output of additional XML elements, + * not change existing stuff here. + * + * If output is already handled by the base Activity classes, + * you can leave this base implementation as a no-op. + * + * @param ActivityObject $obj + * @param XMLOutputter $out to add elements at end of object + */ + function activityObjectOutputAtom(ActivityObject $obj, XMLOutputter $out) + { + // default is a no-op + } + + /** + * Called when generating JSON ActivityStreams output from an + * ActivityObject belonging to this plugin. Gives the plugin + * a chance to add custom output. + * + * Modify the array contents to your heart's content, and it'll + * all get serialized out as JSON. + * + * If output is already handled by the base Activity classes, + * you can leave this base implementation as a no-op. + * + * @param ActivityObject $obj + * @param array &$out JSON-targeted array which can be modified + */ + public function activityObjectOutputJson(ActivityObject $obj, array &$out) + { + // default is a no-op + } + + /** + * When a notice is deleted, delete the related objects + * by calling the overridable $this->deleteRelated(). + * + * @param Notice $notice Notice being deleted + * + * @return boolean hook value + */ + public function onNoticeDeleteRelated(Notice $notice) + { + if ($this->isMyNotice($notice)) { + try { + $this->deleteRelated($notice); + } catch (NoProfileException $e) { + // we failed because of database lookup failure, Notice has no recognized profile as creator + // so we skip this. If we want to remove missing notices we should do a SQL constraints check + // in the affected plugin. + } catch (AlreadyFulfilledException $e) { + // Nothing to see here, it's obviously already gone... + } + } + + // Always continue this event in our activity handling plugins. + return true; + } + + /** + * @param Notice $stored The notice being distributed + * @param array &$mentioned_ids List of profiles (from $stored->getReplies()) + */ + public function onStartNotifyMentioned(Notice $stored, array &$mentioned_ids) + { + if (!$this->isMyNotice($stored)) { + return true; + } + + return $this->notifyMentioned($stored, $mentioned_ids); + } + + /** + * Render a notice as one of our objects + * + * @param Notice $notice Notice to render + * @param ActivityObject &$object Empty object to fill + * + * @return boolean hook value + */ + function onStartActivityObjectFromNotice(Notice $notice, &$object) + { + if (!$this->isMyNotice($notice)) { + return true; + } + + $object = $this->activityObjectFromNotice($notice); + return false; + } + + /** + * Handle a posted object from WebSub + * + * @param Activity $activity activity to handle + * @param Profile $actor Profile for the feed + * + * @return boolean hook value + */ + function onStartHandleFeedEntryWithProfile(Activity $activity, Profile $profile, &$notice) + { + if (!$this->isMyActivity($activity)) { + return true; + } + + // We are guaranteed to get a Profile back from checkAuthorship (or it throws an exception) + $profile = ActivityUtils::checkAuthorship($activity, $profile); + + $object = $activity->objects[0]; + + $options = array('uri' => $object->id, + 'url' => $object->link, + 'self' => $object->selfLink, + 'is_local' => Notice::REMOTE, + 'source' => 'ostatus'); + + if (!isset($this->oldSaveNew)) { + $notice = Notice::saveActivity($activity, $profile, $options); + } else { + $notice = $this->saveNoticeFromActivity($activity, $profile, $options); + } + + return false; + } + + /** + * Handle a posted object from Salmon + * + * @param Activity $activity activity to handle + * @param mixed $target user or group targeted + * + * @return boolean hook value + */ + + function onStartHandleSalmonTarget(Activity $activity, $target) + { + if (!$this->isMyActivity($activity)) { + return true; + } + if (!isset($this->oldSaveNew)) { + // Handle saveActivity in OStatus class for incoming salmon, remove this event + // handler when all plugins have gotten rid of "oldSaveNew". + return true; + } + + $this->log(LOG_INFO, get_called_class()." checking {$activity->id} as a valid Salmon slap."); + + if ($target instanceof User_group || $target->isGroup()) { + $uri = $target->getUri(); + if (!array_key_exists($uri, $activity->context->attention)) { + // @todo FIXME: please document (i18n). + // TRANS: Client exception thrown when ... + throw new ClientException(_('Object not posted to this group.')); + } + } elseif ($target instanceof Profile && $target->isLocal()) { + $original = null; + // FIXME: Shouldn't favorites show up with a 'target' activityobject? + if (!ActivityUtils::compareVerbs($activity->verb, array(ActivityVerb::POST)) && isset($activity->objects[0])) { + // If this is not a post, it's a verb targeted at something (such as a Favorite attached to a note) + if (!empty($activity->objects[0]->id)) { + $activity->context->replyToID = $activity->objects[0]->id; + } + } + if (!empty($activity->context->replyToID)) { + $original = Notice::getKV('uri', $activity->context->replyToID); + } + if ((!$original instanceof Notice || $original->profile_id != $target->id) + && !array_key_exists($target->getUri(), $activity->context->attention)) { + // @todo FIXME: Please document (i18n). + // TRANS: Client exception when ... + throw new ClientException(_('Object not posted to this user.')); + } + } else { + // TRANS: Server exception thrown when a micro app plugin uses a target that cannot be handled. + throw new ServerException(_('Do not know how to handle this kind of target.')); + } + + $oactor = Ostatus_profile::ensureActivityObjectProfile($activity->actor); + $actor = $oactor->localProfile(); + + // FIXME: will this work in all cases? I made it work for Favorite... + if (ActivityUtils::compareVerbs($activity->verb, array(ActivityVerb::POST))) { + $object = $activity->objects[0]; + } else { + $object = $activity; + } + + $options = array('uri' => $object->id, + 'url' => $object->link, + 'self' => $object->selfLink, + 'is_local' => Notice::REMOTE, + 'source' => 'ostatus'); + + $notice = $this->saveNoticeFromActivity($activity, $actor, $options); + + return false; + } + + /** + * Handle object posted via AtomPub + * + * @param Activity $activity Activity that was posted + * @param Profile $scoped Profile of user posting + * @param Notice &$notice Resulting notice + * + * @return boolean hook value + */ + public function onStartAtomPubNewActivity(Activity $activity, Profile $scoped, Notice &$notice=null) + { + if (!$this->isMyActivity($activity)) { + return true; + } + + $options = array('source' => 'atompub'); + + $notice = $this->saveNoticeFromActivity($activity, $scoped, $options); + + return false; + } + + /** + * Handle object imported from a backup file + * + * @param User $user User to import for + * @param ActivityObject $author Original author per import file + * @param Activity $activity Activity to import + * @param boolean $trusted Is this a trusted user? + * @param boolean &$done Is this done (success or unrecoverable error) + * + * @return boolean hook value + */ + function onStartImportActivity($user, $author, Activity $activity, $trusted, &$done) + { + if (!$this->isMyActivity($activity)) { + return true; + } + + $obj = $activity->objects[0]; + + $options = array('uri' => $object->id, + 'url' => $object->link, + 'self' => $object->selfLink, + 'source' => 'restore'); + + // $user->getProfile() is a Profile + $saved = $this->saveNoticeFromActivity($activity, + $user->getProfile(), + $options); + + if (!empty($saved)) { + $done = true; + } + + return false; + } + + /** + * Event handler gives the plugin a chance to add custom + * Atom XML ActivityStreams output from a previously filled-out + * ActivityObject. + * + * The atomOutput method is called if it's one of + * our matching types. + * + * @param ActivityObject $obj + * @param XMLOutputter $out to add elements at end of object + * @return boolean hook return value + */ + function onEndActivityObjectOutputAtom(ActivityObject $obj, XMLOutputter $out) + { + if (in_array($obj->type, $this->types())) { + $this->activityObjectOutputAtom($obj, $out); + } + return true; + } + + /** + * Event handler gives the plugin a chance to add custom + * JSON ActivityStreams output from a previously filled-out + * ActivityObject. + * + * The activityObjectOutputJson method is called if it's one of + * our matching types. + * + * @param ActivityObject $obj + * @param array &$out JSON-targeted array which can be modified + * @return boolean hook return value + */ + function onEndActivityObjectOutputJson(ActivityObject $obj, array &$out) + { + if (in_array($obj->type, $this->types())) { + $this->activityObjectOutputJson($obj, $out); + } + return true; + } + + public function onStartOpenNoticeListItemElement(NoticeListItem $nli) + { + if (!$this->isMyNotice($nli->notice)) { + return true; + } + + $this->openNoticeListItemElement($nli); + + Event::handle('EndOpenNoticeListItemElement', array($nli)); + return false; + } + + public function onStartCloseNoticeListItemElement(NoticeListItem $nli) + { + if (!$this->isMyNotice($nli->notice)) { + return true; + } + + $this->closeNoticeListItemElement($nli); + + Event::handle('EndCloseNoticeListItemElement', array($nli)); + return false; + } + + protected function openNoticeListItemElement(NoticeListItem $nli) + { + $id = (empty($nli->repeat)) ? $nli->notice->id : $nli->repeat->id; + $class = 'h-entry notice ' . $this->tag(); + if ($nli->notice->scope != 0 && $nli->notice->scope != 1) { + $class .= ' limited-scope'; + } + try { + $class .= ' notice-source-'.common_to_alphanumeric($nli->notice->source); + } catch (Exception $e) { + // either source or what we filtered out was a zero-length string + } + $nli->out->elementStart('li', array('class' => $class, + 'id' => 'notice-' . $id)); + } + + protected function closeNoticeListItemElement(NoticeListItem $nli) + { + $nli->out->elementEnd('li'); + } + + + // FIXME: This is overriden in MicroAppPlugin but shouldn't have to be + public function onStartShowNoticeItem(NoticeListItem $nli) + { + if (!$this->isMyNotice($nli->notice)) { + return true; + } + + try { + $this->showNoticeListItem($nli); + } catch (Exception $e) { + common_log(LOG_ERR, 'Error showing notice '.$nli->getNotice()->getID().': ' . $e->getMessage()); + $nli->out->element('p', 'error', sprintf(_('Error showing notice: %s'), $e->getMessage())); + } + + Event::handle('EndShowNoticeItem', array($nli)); + return false; + } + + protected function showNoticeListItem(NoticeListItem $nli) + { + $nli->showNoticeHeaders(); + $nli->showContent(); + $nli->showNoticeFooter(); + } + + public function onStartShowNoticeItemNotice(NoticeListItem $nli) + { + if (!$this->isMyNotice($nli->notice)) { + return true; + } + + $this->showNoticeItemNotice($nli); + + Event::handle('EndShowNoticeItemNotice', array($nli)); + return false; + } + + protected function showNoticeItemNotice(NoticeListItem $nli) + { + $nli->showNoticeTitle(); + $nli->showAuthor(); + $nli->showAddressees(); + $nli->showContent(); + } + + public function onStartShowNoticeContent(Notice $stored, HTMLOutputter $out, Profile $scoped=null) + { + if (!$this->isMyNotice($stored)) { + return true; + } + + try { + $this->showNoticeContent($stored, $out, $scoped); + } catch (Exception $e) { + $out->element('div', 'error', $e->getMessage()); + } + return false; + } + + protected function showNoticeContent(Notice $stored, HTMLOutputter $out, Profile $scoped=null) + { + $out->text($stored->getContent()); + } +} diff --git a/lib/modules/ActivityVerbHandlerModule.php b/lib/modules/ActivityVerbHandlerModule.php index 581b48754b..122a64c158 100644 --- a/lib/modules/ActivityVerbHandlerModule.php +++ b/lib/modules/ActivityVerbHandlerModule.php @@ -23,7 +23,7 @@ if (!defined('GNUSOCIAL')) { exit(1); } * @package Activity * @maintainer Mikael Nordfeldth */ -abstract class ActivityVerbHandlerModule extends ActivityHandlerPlugin +abstract class ActivityVerbHandlerModule extends ActivityHandlerModule { public function onActivityVerbTitle(ManagedAction $action, $verb, Notice $target, Profile $scoped, &$title) { diff --git a/lib/modules/ActivityVerbHandlerPlugin.php b/lib/modules/ActivityVerbHandlerPlugin.php new file mode 100644 index 0000000000..0d06266664 --- /dev/null +++ b/lib/modules/ActivityVerbHandlerPlugin.php @@ -0,0 +1,82 @@ +. + */ + +if (!defined('GNUSOCIAL')) { exit(1); } + +/** + * @package Activity + * @maintainer Mikael Nordfeldth + */ +abstract class ActivityVerbHandlerPlugin extends ActivityHandlerPlugin +{ + public function onActivityVerbTitle(ManagedAction $action, $verb, Notice $target, Profile $scoped, &$title) + { + if (!$this->isMyVerb($verb)) { + return true; + } + + $title = $this->getActionTitle($action, $verb, $target, $scoped); + return false; + } + abstract protected function getActionTitle(ManagedAction $action, $verb, Notice $target, Profile $scoped); + + public function onActivityVerbShowContent(ManagedAction $action, $verb, Notice $target, Profile $scoped) + { + if (!$this->isMyVerb($verb)) { + return true; + } + + return $this->showActionContent($action, $verb, $target, $scoped); + } + protected function showActionContent(ManagedAction $action, $verb, Notice $target, Profile $scoped) + { + if (!GNUsocial::isAjax()) { + $nl = new NoticeListItem($target, $action, array('options'=>false, 'attachments'=>false, + 'item_tag'=>'div', 'id_prefix'=>'fave')); + $nl->show(); + } + + $form = $this->getActivityForm($action, $verb, $target, $scoped); + $form->show(); + + return false; + } + + public function onActivityVerbDoPreparation(ManagedAction $action, $verb, Notice $target, Profile $scoped) + { + if (!$this->isMyVerb($verb)) { + return true; + } + + return $this->doActionPreparation($action, $verb, $target, $scoped); + } + abstract protected function doActionPreparation(ManagedAction $action, $verb, Notice $target, Profile $scoped); + + public function onActivityVerbDoPost(ManagedAction $action, $verb, Notice $target, Profile $scoped) + { + if (!$this->isMyVerb($verb)) { + return true; + } + + return $this->doActionPost($action, $verb, $target, $scoped); + } + abstract protected function doActionPost(ManagedAction $action, $verb, Notice $target, Profile $scoped); + + abstract protected function getActivityForm(ManagedAction $action, $verb, Notice $target, Profile $scoped); +} diff --git a/lib/modules/AuthenticationModule.php b/lib/modules/AuthenticationModule.php new file mode 100644 index 0000000000..97c62eec9c --- /dev/null +++ b/lib/modules/AuthenticationModule.php @@ -0,0 +1,260 @@ +. + * + * @category Plugin + * @package StatusNet + * @author Craig Andrews + * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('GNUSOCIAL')) { exit(1); } + +/** + * Superclass for plugins that do authentication + * + * @category Module + * @package GNUsocial + * @author Craig Andrews + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ +abstract class AuthenticationModule extends Module +{ + //is this plugin authoritative for authentication? + public $authoritative = false; + + //should accounts be automatically created after a successful login attempt? + public $autoregistration = false; + + //can the user change their email address + public $password_changeable=true; + + //unique name for this authentication provider + public $provider_name; + + //------------Auth plugin should implement some (or all) of these methods------------\\ + /** + * Check if a nickname/password combination is valid + * @param username + * @param password + * @return boolean true if the credentials are valid, false if they are invalid. + */ + function checkPassword($username, $password) + { + return false; + } + + /** + * Automatically register a user when they attempt to login with valid credentials. + * User::register($data) is a very useful method for this implementation + * @param username username (that is used to login and find the user in the authentication provider) of the user to be registered + * @param nickname nickname of the user in the SN system. If nickname is null, then set nickname = username + * @return mixed instance of User, or false (if user couldn't be created) + */ + function autoRegister($username, $nickname = null) + { + if(is_null($nickname)){ + $nickname = $username; + } + $registration_data = array(); + $registration_data['nickname'] = $nickname; + return User::register($registration_data); + } + + /** + * Change a user's password + * The old password has been verified to be valid by this plugin before this call is made + * @param username + * @param oldpassword + * @param newpassword + * @return boolean true if the password was changed, false if password changing failed for some reason + */ + function changePassword($username,$oldpassword,$newpassword) + { + return false; + } + + /** + * Given a username, suggest what the nickname should be + * Used during autoregistration + * Useful if your usernames are ugly, and you want to suggest + * nice looking nicknames when users initially sign on + * All nicknames returned by this function should be valid + * implementations may want to use common_nicknamize() to ensure validity + * @param username + * @return string nickname + */ + function suggestNicknameForUsername($username) + { + return common_nicknamize($username); + } + + //------------Below are the methods that connect StatusNet to the implementing Auth plugin------------\\ + function onInitializePlugin(){ + if(!isset($this->provider_name)){ + throw new Exception("must specify a provider_name for this authentication provider"); + } + } + + /** + * Internal AutoRegister event handler + * @param nickname + * @param provider_name + * @param user - the newly registered user + */ + function onAutoRegister($nickname, $provider_name, &$user) + { + if($provider_name == $this->provider_name && $this->autoregistration){ + $suggested_nickname = $this->suggestNicknameForUsername($nickname); + $test_user = User::getKV('nickname', $suggested_nickname); + if($test_user) { + //someone already exists with the suggested nickname, so used the passed nickname + $suggested_nickname = common_nicknamize($nickname); + } + $test_user = User::getKV('nickname', $suggested_nickname); + if($test_user) { + //someone already exists with the suggested nickname + //not much else we can do + }else{ + $user = $this->autoRegister($nickname, $suggested_nickname); + if ($user instanceof User) { + User_username::register($user,$nickname,$this->provider_name); + return false; + } + } + } + } + + function onStartCheckPassword($nickname, $password, &$authenticatedUser){ + //map the nickname to a username + $user_username = new User_username(); + $user_username->username=$nickname; + $user_username->provider_name=$this->provider_name; + if($user_username->find() && $user_username->fetch()){ + $authenticated = $this->checkPassword($user_username->username, $password); + if($authenticated){ + $authenticatedUser = User::getKV('id', $user_username->user_id); + return false; + } + }else{ + //$nickname is the username used to login + //$suggested_nickname is the nickname the auth provider suggests for that username + $suggested_nickname = $this->suggestNicknameForUsername($nickname); + $user = User::getKV('nickname', $suggested_nickname); + if($user){ + //make sure this user isn't claimed + $user_username = new User_username(); + $user_username->user_id=$user->id; + $we_can_handle = false; + if($user_username->find()){ + //either this provider, or another one, has already claimed this user + //so we cannot. Let another plugin try. + return; + }else{ + //no other provider claims this user, so it's safe for us to handle it + $authenticated = $this->checkPassword($nickname, $password); + if($authenticated){ + $authenticatedUser = $user; + User_username::register($authenticatedUser,$nickname,$this->provider_name); + return false; + } + } + }else{ + $authenticated = $this->checkPassword($nickname, $password); + if($authenticated){ + if(! Event::handle('AutoRegister', array($nickname, $this->provider_name, &$authenticatedUser))){ + //unlike most Event::handle lines of code, this one has a ! (not) + //we want to do this if the event *was* handled - this isn't a "default" implementation + //like most code of this form. + if($authenticatedUser){ + return false; + } + } + } + } + } + if($this->authoritative){ + return false; + }else{ + //we're not authoritative, so let other handlers try + return; + } + } + + function onStartChangePassword(Profile $target ,$oldpassword, $newpassword) + { + if($this->password_changeable){ + $user_username = new User_username(); + $user_username->user_id = $target->getID(); + $user_username->provider_name=$this->provider_name; + if ($user_username->find(true)) { + $authenticated = $this->checkPassword($user_username->username, $oldpassword); + if($authenticated){ + $result = $this->changePassword($user_username->username,$oldpassword,$newpassword); + if($result){ + //stop handling of other handlers, because what was requested was done + return false; + }else{ + // TRANS: Exception thrown when a password change fails. + throw new Exception(_('Password changing failed.')); + } + }else{ + if($this->authoritative){ + //since we're authoritative, no other plugin could do this + // TRANS: Exception thrown when a password change fails. + throw new Exception(_('Password changing failed.')); + }else{ + //let another handler try + return null; + } + } + } + }else{ + if($this->authoritative){ + //since we're authoritative, no other plugin could do this + // TRANS: Exception thrown when a password change attempt fails because it is not allowed. + throw new Exception(_('Password changing is not allowed.')); + } + } + } + + function onStartAccountSettingsPasswordMenuItem($widget) + { + if($this->authoritative && !$this->password_changeable){ + //since we're authoritative, no other plugin could change passwords, so do not render the menu item + return false; + } + } + + function onCheckSchema() { + $schema = Schema::get(); + $schema->ensureTable('user_username', User_username::schemaDef()); + return true; + } + + function onUserDeleteRelated($user, &$tables) + { + $tables[] = 'User_username'; + return true; + } +} diff --git a/lib/modules/MicroAppModule.php b/lib/modules/MicroAppPlugin.php similarity index 98% rename from lib/modules/MicroAppModule.php rename to lib/modules/MicroAppPlugin.php index 182cd6424c..7fb05d160f 100644 --- a/lib/modules/MicroAppModule.php +++ b/lib/modules/MicroAppPlugin.php @@ -48,7 +48,7 @@ if (!defined('STATUSNET')) { * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0 * @link http://status.net/ */ -abstract class MicroAppModule extends ActivityHandlerPlugin +abstract class MicroAppPlugin extends ActivityHandlerPlugin { /** * Returns a localized string which represents this micro-app, diff --git a/lib/modules/Module.php b/lib/modules/Module.php new file mode 100644 index 0000000000..70f0e1b8de --- /dev/null +++ b/lib/modules/Module.php @@ -0,0 +1,221 @@ +. + +defined('GNUSOCIAL') || die(); + +/** + * Base class for modules + * + * A base class for GNU social modules. Mostly a light wrapper around + * the Event framework. + * + * Subclasses of Module will automatically handle an event if they define + * a method called "onEventName". (Well, OK -- only if they call parent::__construct() + * in their constructors.) + * + * They will also automatically handle the InitializeModule and CleanupModule with the + * initialize() and cleanup() methods, respectively. + * + * @category Module + * @package GNUsocial + * @author Evan Prodromou + * @copyright 2010-2019 Free Software Foundation, Inc http://www.fsf.org + * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later + * + * @see Event + */ +class Module +{ + public function __construct() + { + Event::addHandler('InitializeModule', [$this, 'initialize']); + Event::addHandler('CleanupModule', [$this, 'cleanup']); + + foreach (get_class_methods($this) as $method) { + if (mb_substr($method, 0, 2) == 'on') { + Event::addHandler(mb_substr($method, 2), [$this, $method]); + } + } + + $this->setupGettext(); + } + + public function initialize() + { + return true; + } + + public function cleanup() + { + return true; + } + + /** + * Load related components when needed + * + * Most non-trivial plugins will require extra components to do their work. Typically + * these include data classes, action classes, widget classes, or external libraries. + * + * This method receives a class name and loads the PHP file related to that class. By + * tradition, action classes typically have files named for the action, all lower-case. + * Data classes are in files with the data class name, initial letter capitalized. + * + * Note that this method will be called for *all* overloaded classes, not just ones + * in this plugin! So, make sure to return true by default to let other plugins, and + * the core code, get a chance. + * + * @param string $cls Name of the class to be loaded + * + * @return bool hook value; true means continue processing, false means stop. + */ + public function onAutoload($cls) + { + $cls = basename($cls); + $basedir = INSTALLDIR . '/modules/' . mb_substr(get_called_class(), 0, -6); + + $file = null; + + if (preg_match('/^(\w+)(Action|Form)$/', $cls, $type)) { + $type = array_map('strtolower', $type); + $file = "{$basedir}/{$type[2]}s/{$type[1]}.php"; + } + if (!file_exists($file)) { + $file = "{$basedir}/classes/{$cls}.php"; + + // library files can be put into subdirs ('_'->'/' conversion) + // such as LRDDMethod_WebFinger -> lib/lrddmethod/webfinger.php + if (!file_exists($file)) { + $type = strtolower($cls); + $type = str_replace('_', '/', $type); + $file = "{$basedir}/lib/{$type}.php"; + } + } + + if (!is_null($file) && file_exists($file)) { + require_once $file; + return false; + } + + return true; + } + + /** + * Checks if this plugin has localization that needs to be set up. + * Gettext localizations can be called via the _m() helper function. + */ + protected function setupGettext() + { + $class = get_class($this); + if (substr($class, -6) == 'Module') { + $name = substr($class, 0, -6); + $path = common_config('plugins', 'locale_path'); + if (!$path) { + // @fixme this will fail for things installed in local/plugins + // ... but then so will web links so far. + $path = INSTALLDIR . "/modules/{$name}/locale"; + } + if (file_exists($path) && is_dir($path)) { + bindtextdomain($name, $path); + bind_textdomain_codeset($name, 'UTF-8'); + } + } + } + + protected function log($level, $msg) + { + common_log($level, get_class($this) . ': ' . $msg); + } + + protected function debug($msg) + { + $this->log(LOG_DEBUG, $msg); + } + + public function name() + { + $cls = get_class($this); + return mb_substr($cls, 0, -6); + } + + public function version() + { + return GNUSOCIAL_VERSION; + } + + protected function userAgent() + { + return HTTPClient::userAgent() + . ' (' . get_class($this) . ' v' . $this->version() . ')'; + } + + public function onModuleVersion(array &$versions): bool + { + $name = $this->name(); + + $versions[] = [ + 'name' => $name, + // TRANS: Displayed as version information for a plugin if no version information was found. + 'version' => _m('Unknown') + ]; + + return true; + } + + public static function staticPath($module, $relative) + { + if (GNUsocial::useHTTPS()) { + $server = common_config('plugins', 'sslserver'); + } else { + $server = common_config('plugins', 'server'); + } + + if (empty($server)) { + if (GNUsocial::useHTTPS()) { + $server = common_config('site', 'sslserver'); + } + if (empty($server)) { + $server = common_config('site', 'server'); + } + } + + if (GNUsocial::useHTTPS()) { + $path = common_config('plugins', 'sslpath'); + } else { + $path = common_config('plugins', 'path'); + } + + if (empty($path)) { + $path = common_config('site', 'path') . '/modules/'; + } + + if ($path[strlen($path) - 1] != '/') { + $path .= '/'; + } + + if ($path[0] != '/') { + $path = '/' . $path; + } + + $protocol = GNUsocial::useHTTPS() ? 'https' : 'http'; + + return $protocol . '://' . $server . $path . $module . '/' . $relative; + } + + public function path($relative) + { + return self::staticPath($this->name(), $relative); + } +} diff --git a/lib/modules/Plugin.php b/lib/modules/Plugin.php index 836836dac2..a2ea5290a3 100644 --- a/lib/modules/Plugin.php +++ b/lib/modules/Plugin.php @@ -17,9 +17,9 @@ defined('GNUSOCIAL') || die(); /** - * Base class for modules + * Base class for plugins * - * A base class for GNU social modules. Mostly a light wrapper around + * A base class for GNU social plugin. Mostly a light wrapper around * the Event framework. * * Subclasses of Plugin will automatically handle an event if they define @@ -37,7 +37,7 @@ defined('GNUSOCIAL') || die(); * * @see Event */ -class Plugin +class Plugin extends Module { public function __construct() { @@ -46,7 +46,7 @@ class Plugin foreach (get_class_methods($this) as $method) { if (mb_substr($method, 0, 2) == 'on') { - Event::addHandler(mb_substr($method, 2), array($this, $method)); + Event::addHandler(mb_substr($method, 2), [$this, $method]); } } @@ -85,9 +85,6 @@ class Plugin { $cls = basename($cls); $basedir = INSTALLDIR . '/local/plugins/' . mb_substr(get_called_class(), 0, -6); - if (!file_exists($basedir)) { - $basedir = INSTALLDIR . '/modules/' . mb_substr(get_called_class(), 0, -6); - } if (!file_exists($basedir)) { $basedir = INSTALLDIR . '/plugins/' . mb_substr(get_called_class(), 0, -6); } @@ -111,7 +108,7 @@ class Plugin } if (!is_null($file) && file_exists($file)) { - require_once($file); + require_once $file; return false; } @@ -125,16 +122,13 @@ class Plugin protected function setupGettext() { $class = get_class($this); - if (substr($class, -6) == 'Module') { + if (substr($class, -6) == 'Plugin') { $name = substr($class, 0, -6); $path = common_config('plugins', 'locale_path'); if (!$path) { // @fixme this will fail for things installed in local/plugins // ... but then so will web links so far. $path = INSTALLDIR . "/plugins/{$name}/locale"; - if (!file_exists($path)) { - $path = INSTALLDIR . "/modules/{$name}/locale"; - } if (!file_exists($path)) { $path = INSTALLDIR . "/local/plugins/{$name}/locale"; } @@ -146,50 +140,25 @@ class Plugin } } - protected function log($level, $msg) - { - common_log($level, get_class($this) . ': ' . $msg); - } - - protected function debug($msg) - { - $this->log(LOG_DEBUG, $msg); - } - - public function name() - { - $cls = get_class($this); - return mb_substr($cls, 0, -6); - } - - public function version() - { - return GNUSOCIAL_VERSION; - } - - protected function userAgent() - { - return HTTPClient::userAgent() - . ' (' . get_class($this) . ' v' . $this->version() . ')'; - } - - public function onModuleVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $name = $this->name(); - $versions[] = array('name' => $name, + $versions[] = [ + 'name' => $name, // TRANS: Displayed as version information for a plugin if no version information was found. - 'version' => _('Unknown')); + 'version' => _m('Unknown') + ]; return true; } - public function path($relative) + public function onModuleVersion(array &$versions): bool { - return self::staticPath($this->name(), $relative); + return true; } - public static function staticPath($module, $relative) + public static function staticPath($plugin, $relative) { if (GNUsocial::useHTTPS()) { $server = common_config('plugins', 'sslserver'); @@ -214,10 +183,8 @@ class Plugin if (empty($path)) { // XXX: extra stat(). - if (@file_exists(PUBLICDIR . '/local/plugins/' . $module . '/' . $relative)) { + if (@file_exists(PUBLICDIR . '/local/plugins/' . $plugin . '/' . $relative)) { $path = common_config('site', 'path') . '/local/plugins/'; - } elseif (@file_exists(PUBLICDIR . '/modules/' . $module . '/' . $relative)) { - $path = common_config('site', 'path') . '/modules/'; } else { $path = common_config('site', 'path') . '/plugins/'; } @@ -233,6 +200,11 @@ class Plugin $protocol = GNUsocial::useHTTPS() ? 'https' : 'http'; - return $protocol . '://' . $server . $path . $module . '/' . $relative; + return $protocol . '://' . $server . $path . $plugin . '/' . $relative; + } + + public function path($relative) + { + return self::staticPath($this->name(), $relative); } } diff --git a/lib/pluginqueuehandler.php b/lib/pluginqueuehandler.php index 6f5223e434..8fcd15e6a5 100644 --- a/lib/pluginqueuehandler.php +++ b/lib/pluginqueuehandler.php @@ -17,16 +17,16 @@ defined('GNUSOCIAL') || die(); /** - * Queue handler for letting modules handle stuff. + * Queue handler for letting plugins handle stuff. * - * The module queue handler accepts notices over the "module" queue + * The module queue handler accepts notices over the "plugin" queue * and simply passes them through the "HandleQueuedNotice" event. * * This gives plugins a chance to do background processing without * actually registering their own queue and ensuring that things * are queued into it. * - * Fancier modules may wish to instead hook the 'GetQueueHandlerClass' + * Fancier plugins may wish to instead hook the 'GetQueueHandlerClass' * event with their own class, in which case they must ensure that * their notices get enqueued when they need them. */ diff --git a/modules/Activity/ActivityPlugin.php b/modules/Activity/ActivityModule.php similarity index 97% rename from modules/Activity/ActivityPlugin.php rename to modules/Activity/ActivityModule.php index 29dbb13f3c..bbcab96a4a 100644 --- a/modules/Activity/ActivityPlugin.php +++ b/modules/Activity/ActivityModule.php @@ -44,7 +44,7 @@ if (!defined('STATUSNET')) { * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0 * @link http://status.net/ */ -class ActivityPlugin extends Plugin +class ActivityModule extends Module { const PLUGIN_VERSION = '0.1.0'; const SOURCE = 'activity'; @@ -88,7 +88,7 @@ class ActivityPlugin extends Plugin $notice = Notice::saveNew($profile->id, $content, - ActivityPlugin::SOURCE, + ActivityModule::SOURCE, array('rendered' => $rendered, 'urls' => array(), 'replies' => array($other->getUri()), @@ -131,7 +131,7 @@ class ActivityPlugin extends Plugin $notice = Notice::saveNew($profile->id, $content, - ActivityPlugin::SOURCE, + ActivityModule::SOURCE, array('rendered' => $rendered, 'urls' => array(), 'replies' => array($other->getUri()), @@ -176,7 +176,7 @@ class ActivityPlugin extends Plugin $notice = Notice::saveNew($profile->id, $content, - ActivityPlugin::SOURCE, + ActivityModule::SOURCE, array('rendered' => $rendered, 'urls' => array(), 'replies' => array($author->getUri()), @@ -219,7 +219,7 @@ class ActivityPlugin extends Plugin $notice = Notice::saveNew($profile->id, $content, - ActivityPlugin::SOURCE, + ActivityModule::SOURCE, array('rendered' => $rendered, 'urls' => array(), 'groups' => array($group->id), @@ -262,7 +262,7 @@ class ActivityPlugin extends Plugin $notice = Notice::saveNew($profile->id, $content, - ActivityPlugin::SOURCE, + ActivityModule::SOURCE, array('rendered' => $rendered, 'urls' => array(), 'groups' => array($group->id), @@ -339,14 +339,14 @@ class ActivityPlugin extends Plugin return true; } - function onPluginVersion(array &$versions) + function onModuleVersion(array &$versions): bool { $versions[] = array('name' => 'Activity', 'version' => self::PLUGIN_VERSION, 'author' => 'Evan Prodromou', 'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/Activity', 'rawdescription' => - // TRANS: Plugin description. + // TRANS: Module description. _m('Emits notices when social activities happen.')); return true; } diff --git a/modules/ActivityModeration/ActivityModerationModule.php b/modules/ActivityModeration/ActivityModerationModule.php new file mode 100644 index 0000000000..92a98de27b --- /dev/null +++ b/modules/ActivityModeration/ActivityModerationModule.php @@ -0,0 +1,214 @@ + + */ +class ActivityModerationModule extends ActivityVerbHandlerModule +{ + public function tag() + { + return 'actmod'; + } + + public function types() + { + return array(); + } + + public function verbs() + { + return array(ActivityVerb::DELETE); + } + + public function onBeforePluginCheckSchema() + { + Deleted_notice::beforeSchemaUpdate(); + return true; + } + + public function onCheckSchema() + { + $schema = Schema::get(); + $schema->ensureTable('deleted_notice', Deleted_notice::schemaDef()); + return true; + } + + public function onGetNoticeSqlTimestamp($id, &$timestamp) + { + try { + $deleted = Deleted_notice::getByID($id); + $timestamp = $deleted->act_created; + } catch (NoResultException $e) { + return true; + } + // we're done for the event, so return false to stop it + return false; + } + + public function onIsNoticeDeleted($id, &$deleted) + { + try { + $found = Deleted_notice::getByID($id); + $deleted = ($found instanceof Deleted_notice); + } catch (NoResultException $e) { + $deleted = false; + } + // return true (continue event) if $deleted is false, return false (stop event) if deleted notice was found + return !$deleted; + } + + protected function getActionTitle(ManagedAction $action, $verb, Notice $target, Profile $scoped) + { + // FIXME: switch based on action type + return _m('TITLE', 'Notice moderation'); + } + + protected function doActionPreparation(ManagedAction $action, $verb, Notice $target, Profile $scoped) + { + // pass + } + + protected function doActionPost(ManagedAction $action, $verb, Notice $target, Profile $scoped) + { + switch (true) { + case ActivityUtils::compareVerbs($verb, array(ActivityVerb::DELETE)): + // do whatever preparation is necessary to delete a verb + $target->deleteAs($scoped); + break; + default: + throw new ServerException('ActivityVerb POST not handled by plugin that was supposed to do it.'); + } + } + + public function deleteRelated(Notice $notice) + { + // pass + } + + public function onDeleteNoticeAsProfile(Notice $stored, Profile $actor, &$result) { + // By adding a new object with the 'delete' verb we will trigger + // $this->saveObjectFromActivity that will do the actual ->delete() + if (false === Deleted_notice::addNew($stored, $actor)) { + // false is returned if we did not have an error, but did not create the object + // (i.e. the author is currently being deleted) + return true; + } + + // We return false (to stop the event) if the deleted_notice entry was + // added, which means we have already run $this->saveObjectFromActivity + // which in turn has called the delete function of the notice. + return false; + } + + /** + * This is run when a 'delete' verb activity comes in. + * + * @return boolean hook flag + */ + protected function saveObjectFromActivity(Activity $act, Notice $stored, array $options=array()) + { + // Everything is done in the StartNoticeSave event + return true; + } + + // FIXME: Put this in lib/modules/ActivityHandlerPlugin.php when we're ready + // with the other microapps/activityhandlers as well. + // Also it should be StartNoticeAsActivity (with a prepped Activity, including ->context etc.) + public function onEndNoticeAsActivity(Notice $stored, Activity $act, Profile $scoped=null) + { + if (!$this->isMyNotice($stored)) { + return true; + } + + common_debug('Extending activity '.$stored->id.' with '.get_called_class()); + $this->extendActivity($stored, $act, $scoped); + return false; + } + + /** + * This is run before ->insert, so our task in this function is just to + * delete if it is the delete verb. + */ + public function onStartNoticeSave(Notice $stored) + { + // DELETE is a bit special, we have to remove the existing entry and then + // add a new one with the same URI in order to trigger the distribution. + // (that's why we don't use $this->isMyNotice(...)) + if (!ActivityUtils::compareVerbs($stored->verb, array(ActivityVerb::DELETE))) { + return true; + } + + try { + $target = Notice::getByUri($stored->uri); + } catch (NoResultException $e) { + throw new AlreadyFulfilledException('Notice URI not found, so we have nothing to delete.'); + } + + $actor = $stored->getProfile(); + $owner = $target->getProfile(); + + if ($owner->hasRole(Profile_role::DELETED)) { + // Don't bother with replacing notices if its author is being deleted. + // The later "StoreActivityObject" will pick this up and execute + // the deletion then. + // (the "delete verb notice" is too new to ever pass through Notice::saveNew + // which otherwise wouldn't execute the StoreActivityObject event) + return true; + } + + // Since the user deleting may not be the same as the notice's owner, + // double-check this and also set the "re-stored" notice profile_id. + if (!$actor->sameAs($owner) && !$actor->hasRight(Right::DELETEOTHERSNOTICE)) { + throw new AuthorizationException(_('You are not allowed to delete another user\'s notice.')); + } + + // We copy the identifying fields and replace the sensitive ones. + //$stored->id = $target->id; // We can't copy this since DB_DataObject won't inject it anyway + $props = array('uri', 'profile_id', 'conversation', 'reply_to', 'created', 'repeat_of', 'object_type', 'is_local', 'scope'); + foreach($props as $prop) { + $stored->$prop = $target->$prop; + } + + // Let's see if this has been deleted already. + try { + $deleted = Deleted_notice::getByKeys( ['uri' => $stored->getUri()] ); + return $deleted; + } catch (NoResultException $e) { + $deleted = new Deleted_notice(); + + $deleted->id = $target->getID(); + $deleted->profile_id = $actor->getID(); + $deleted->uri = $stored->getUri(); + $deleted->act_created = $stored->created; + $deleted->created = common_sql_now(); + + // throws exception on error + $result = $deleted->insert(); + } + + // Now we delete the original notice, leaving the id and uri free. + $target->delete(); + + return true; + } + + public function extendActivity(Notice $stored, Activity $act, Profile $scoped=null) + { + Deleted_notice::extendActivity($stored, $act, $scoped); + } + + public function activityObjectFromNotice(Notice $notice) + { + $object = Deleted_notice::fromStored($notice); + return $object->asActivityObject(); + } + + protected function getActivityForm(ManagedAction $action, $verb, Notice $target, Profile $scoped) + { + if (!$scoped instanceof Profile || !($scoped->sameAs($target->getProfile()) || $scoped->hasRight(Right::DELETEOTHERSNOTICE))) { + throw new AuthorizationException(_('You are not allowed to delete other user\'s notices')); + } + return DeletenoticeForm($action, array('notice'=>$target)); + } +} diff --git a/modules/ActivityModeration/locale/ActivityModeration.pot b/modules/ActivityModeration/locale/ActivityModeration.pot index b8da4f49a6..3f7980a7ed 100644 --- a/modules/ActivityModeration/locale/ActivityModeration.pot +++ b/modules/ActivityModeration/locale/ActivityModeration.pot @@ -41,7 +41,7 @@ msgctxt "BUTTON" msgid "Yes" msgstr "" -#: ActivityModerationPlugin.php:64 +#: ActivityModerationModule.php:64 msgctxt "TITLE" msgid "Notice moderation" msgstr "" diff --git a/modules/ActivityVerb/ActivityVerbPlugin.php b/modules/ActivityVerb/ActivityVerbModule.php similarity index 90% rename from modules/ActivityVerb/ActivityVerbPlugin.php rename to modules/ActivityVerb/ActivityVerbModule.php index 2c6c7ad558..7c4fb1f5c8 100644 --- a/modules/ActivityVerb/ActivityVerbPlugin.php +++ b/modules/ActivityVerb/ActivityVerbModule.php @@ -2,7 +2,7 @@ /** * GNU social - a federating social network * - * Plugin that handles activity verb interact (like 'favorite' etc.) + * Module that handles activity verb interact (like 'favorite' etc.) * * PHP version 5 * @@ -19,7 +19,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . * - * @category Plugin + * @category Module * @package GNUsocial * @author Mikael Nordfeldth * @copyright 2014 Free Software Foundation http://fsf.org @@ -29,7 +29,7 @@ if (!defined('GNUSOCIAL')) { exit(1); } -class ActivityVerbPlugin extends Plugin +class ActivityVerbModule extends Module { const PLUGIN_VERSION = '2.0.0'; @@ -57,14 +57,14 @@ class ActivityVerbPlugin extends Plugin 'verb' => $verb_regexp]); } - public function onPluginVersion(array &$versions) + public function onModuleVersion(array &$versions): bool { $versions[] = array('name' => 'Activity Verb', 'version' => self::PLUGIN_VERSION, 'author' => 'Mikael Nordfeldth', 'homepage' => 'https://www.gnu.org/software/social/', 'rawdescription' => - // TRANS: Plugin description. + // TRANS: Module description. _m('Adds more standardized verb handling for activities.')); return true; } diff --git a/modules/ActivityVerb/actions/activityverb.php b/modules/ActivityVerb/actions/activityverb.php index 45bb18be46..03f359b0a9 100644 --- a/modules/ActivityVerb/actions/activityverb.php +++ b/modules/ActivityVerb/actions/activityverb.php @@ -19,7 +19,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . * - * @category Plugin + * @category Module * @package GNUsocial * @author Mikael Nordfeldth * @copyright 2015 Free Software Foundaction, Inc. diff --git a/modules/ActivityVerb/locale/ActivityVerb.pot b/modules/ActivityVerb/locale/ActivityVerb.pot index a4af4432af..27663fa7fc 100644 --- a/modules/ActivityVerb/locale/ActivityVerb.pot +++ b/modules/ActivityVerb/locale/ActivityVerb.pot @@ -17,7 +17,7 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#. TRANS: Plugin description. -#: ActivityVerbPlugin.php:56 +#. TRANS: Module description. +#: ActivityVerbModule.php:56 msgid "Adds more standardized verb handling for activities." msgstr "" diff --git a/modules/ActivityVerbPost/ActivityVerbPostPlugin.php b/modules/ActivityVerbPost/ActivityVerbPostModule.php similarity index 91% rename from modules/ActivityVerbPost/ActivityVerbPostPlugin.php rename to modules/ActivityVerbPost/ActivityVerbPostModule.php index ca6dc5f0c5..9d71ec73fa 100644 --- a/modules/ActivityVerbPost/ActivityVerbPostPlugin.php +++ b/modules/ActivityVerbPost/ActivityVerbPostModule.php @@ -23,9 +23,9 @@ if (!defined('GNUSOCIAL')) { exit(1); } * @package Activity * @maintainer Mikael Nordfeldth */ -class ActivityVerbPostPlugin extends ActivityVerbHandlerPlugin +class ActivityVerbPostModule extends ActivityVerbHandlerModule { - const PLUGIN_VERSION = '2.0.0'; + const MODULE_VERSION = '2.0.0'; // TODO: Implement a "fallback" feature which can handle anything _as_ an activityobject "note" @@ -50,7 +50,7 @@ class ActivityVerbPostPlugin extends ActivityVerbHandlerPlugin return array(ActivityVerb::POST); } - // FIXME: Set this to abstract public in lib/ActivityHandlerPlugin.php when all plugins have migrated! + // FIXME: Set this to abstract public in classes/modules/ActivityHandlerModule.php when all plugins have migrated! protected function saveObjectFromActivity(Activity $act, Notice $stored, array $options=array()) { assert($this->isMyActivity($act)); @@ -127,14 +127,14 @@ class ActivityVerbPostPlugin extends ActivityVerbHandlerPlugin return new NoticeForm($action, array()); } - public function onPluginVersion(array &$versions) + public function onModuleVersion(array &$versions): bool { $versions[] = array('name' => 'Post verb', - 'version' => self::PLUGIN_VERSION, + 'version' => self::MODULE_VERSION, 'author' => 'Mikael Nordfeldth', 'homepage' => 'https://gnu.io/', 'rawdescription' => - // TRANS: Plugin description. + // TRANS: Module description. _m('Post handling with ActivityStreams.')); return true; diff --git a/modules/ActivityVerbPost/locale/ActivityVerbPost.pot b/modules/ActivityVerbPost/locale/ActivityVerbPost.pot index e4e1e5eadb..84c0752f7f 100644 --- a/modules/ActivityVerbPost/locale/ActivityVerbPost.pot +++ b/modules/ActivityVerbPost/locale/ActivityVerbPost.pot @@ -17,7 +17,7 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#. TRANS: Plugin description. -#: ActivityVerbPostPlugin.php:138 +#. TRANS: Module description. +#: ActivityVerbPostModule.php:138 msgid "Post handling with ActivityStreams." msgstr "" diff --git a/modules/AuthCrypt/AuthCryptPlugin.php b/modules/AuthCrypt/AuthCryptModule.php similarity index 95% rename from modules/AuthCrypt/AuthCryptPlugin.php rename to modules/AuthCrypt/AuthCryptModule.php index 763cf64ca3..c938548dfc 100644 --- a/modules/AuthCrypt/AuthCryptPlugin.php +++ b/modules/AuthCrypt/AuthCryptModule.php @@ -2,7 +2,7 @@ /** * StatusNet, the distributed open-source microblogging tool * - * Plugin to use crypt() for user password hashes + * Module to use crypt() for user password hashes * * PHP version 5 * @@ -19,7 +19,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . * - * @category Plugin + * @category Module * @package GNUsocial * @author Mikael Nordfeldth * @copyright 2012 StatusNet, Inc. @@ -30,10 +30,10 @@ if (!defined('GNUSOCIAL')) { exit(1); } -class AuthCryptPlugin extends AuthenticationPlugin +class AuthCryptModule extends AuthenticationModule { const PLUGIN_VERSION = '2.0.0'; - protected $hash = '$6$'; // defaults to SHA512, i.e. '$6$', in onInitializePlugin() + protected $hash = '$6$'; // defaults to SHA512, i.e. '$6$', in onInitializeModule() protected $statusnet = true; // if true, also check StatusNet style password hash protected $overwrite = true; // if true, password change means overwrite with crypt() protected $argon = false; // Use Argon if supported. @@ -164,7 +164,7 @@ class AuthCryptPlugin extends AuthenticationPlugin public function onCheckSchema() { - // we only use the User database, so default AuthenticationPlugin stuff can be ignored + // we only use the User database, so default AuthenticationModule stuff can be ignored return true; } @@ -174,14 +174,14 @@ class AuthCryptPlugin extends AuthenticationPlugin return true; } - public function onPluginVersion(array &$versions) + public function onModuleVersion(array &$versions): bool { $versions[] = array('name' => 'AuthCrypt', 'version' => self::PLUGIN_VERSION, 'author' => 'Mikael Nordfeldth', 'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/AuthCrypt', 'rawdescription' => - // TRANS: Plugin description. + // TRANS: Module description. _m('Authentication and password hashing with crypt()')); return true; } diff --git a/modules/AuthCrypt/README b/modules/AuthCrypt/README index f18a1b815d..43cf66f6ed 100644 --- a/modules/AuthCrypt/README +++ b/modules/AuthCrypt/README @@ -10,17 +10,17 @@ Add either of the following configurations to your config.php (see Example below The recommended use is to overwrite old hash values when logging in (statusnet + overwrite modes) and be the authority on password checks when logging in. If you only wish to update entries on password change the default values are enough. 'statusnet' and 'overwrite' are true by default. 'authoritative' is only necessary if we want to exclude other plugins from verifying the password. - addPlugin('AuthCrypt'); + addModule('AuthCrypt'); To disable updating to crypt() on password change (and login with the 'statusnet' compatibility mode), simply set the 'overwrite' setting to false: - addPlugin('AuthCrypt', array( + addModule('AuthCrypt', array( 'overwrite'=>false, )); Settings ======== -Default values in parenthesis. Many settings are inherited from the AuthenticationPlugin class. +Default values in parenthesis. Many settings are inherited from the AuthenticationModule class. authoritative (false): Set this to true when _all_ passwords are hashed with crypt() (warning: this may disable all other password verification, also when changing passwords!) diff --git a/modules/AuthCrypt/locale/AuthCrypt.pot b/modules/AuthCrypt/locale/AuthCrypt.pot index a3cc1434f8..8c877f5b1f 100644 --- a/modules/AuthCrypt/locale/AuthCrypt.pot +++ b/modules/AuthCrypt/locale/AuthCrypt.pot @@ -17,7 +17,7 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#. TRANS: Plugin description. -#: AuthCryptPlugin.php:162 +#. TRANS: Module description. +#: AuthCryptModule.php:162 msgid "Authentication and password hashing with crypt()" msgstr "" diff --git a/modules/AuthCrypt/locale/af/LC_MESSAGES/AuthCrypt.po b/modules/AuthCrypt/locale/af/LC_MESSAGES/AuthCrypt.po index 33a45e6658..cdb37e552a 100644 --- a/modules/AuthCrypt/locale/af/LC_MESSAGES/AuthCrypt.po +++ b/modules/AuthCrypt/locale/af/LC_MESSAGES/AuthCrypt.po @@ -17,7 +17,7 @@ msgstr "" "Language: af\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#. TRANS: Plugin description. -#: AuthCryptPlugin.php:157 +#. TRANS: Module description. +#: AuthCryptModule.php:157 msgid "Authentication and password hashing with crypt()" msgstr "" diff --git a/modules/AuthCrypt/locale/ar/LC_MESSAGES/AuthCrypt.po b/modules/AuthCrypt/locale/ar/LC_MESSAGES/AuthCrypt.po index 8c107cf331..5eca61f2cd 100644 --- a/modules/AuthCrypt/locale/ar/LC_MESSAGES/AuthCrypt.po +++ b/modules/AuthCrypt/locale/ar/LC_MESSAGES/AuthCrypt.po @@ -17,7 +17,7 @@ msgstr "" "Language: ar\n" "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" -#. TRANS: Plugin description. -#: AuthCryptPlugin.php:157 +#. TRANS: Module description. +#: AuthCryptModule.php:157 msgid "Authentication and password hashing with crypt()" msgstr "" diff --git a/modules/AuthCrypt/locale/arz/LC_MESSAGES/AuthCrypt.po b/modules/AuthCrypt/locale/arz/LC_MESSAGES/AuthCrypt.po index ee7c823af1..4723fd9bda 100644 --- a/modules/AuthCrypt/locale/arz/LC_MESSAGES/AuthCrypt.po +++ b/modules/AuthCrypt/locale/arz/LC_MESSAGES/AuthCrypt.po @@ -17,7 +17,7 @@ msgstr "" "Language: ar_EG\n" "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" -#. TRANS: Plugin description. -#: AuthCryptPlugin.php:157 +#. TRANS: Module description. +#: AuthCryptModule.php:157 msgid "Authentication and password hashing with crypt()" msgstr "" diff --git a/modules/AuthCrypt/locale/ast/LC_MESSAGES/AuthCrypt.po b/modules/AuthCrypt/locale/ast/LC_MESSAGES/AuthCrypt.po index 6d7b70c620..557608f5c6 100644 --- a/modules/AuthCrypt/locale/ast/LC_MESSAGES/AuthCrypt.po +++ b/modules/AuthCrypt/locale/ast/LC_MESSAGES/AuthCrypt.po @@ -17,7 +17,7 @@ msgstr "" "Language: ast\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#. TRANS: Plugin description. -#: AuthCryptPlugin.php:157 +#. TRANS: Module description. +#: AuthCryptModule.php:157 msgid "Authentication and password hashing with crypt()" msgstr "" diff --git a/modules/AuthCrypt/locale/be-tarask/LC_MESSAGES/AuthCrypt.po b/modules/AuthCrypt/locale/be-tarask/LC_MESSAGES/AuthCrypt.po index 2defe1daf8..4a3919d60d 100644 --- a/modules/AuthCrypt/locale/be-tarask/LC_MESSAGES/AuthCrypt.po +++ b/modules/AuthCrypt/locale/be-tarask/LC_MESSAGES/AuthCrypt.po @@ -17,7 +17,7 @@ msgstr "" "Language: be@tarask\n" "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n" -#. TRANS: Plugin description. -#: AuthCryptPlugin.php:157 +#. TRANS: Module description. +#: AuthCryptModule.php:157 msgid "Authentication and password hashing with crypt()" msgstr "" diff --git a/modules/AuthCrypt/locale/bg/LC_MESSAGES/AuthCrypt.po b/modules/AuthCrypt/locale/bg/LC_MESSAGES/AuthCrypt.po index b9334c9632..51bb4ffdd0 100644 --- a/modules/AuthCrypt/locale/bg/LC_MESSAGES/AuthCrypt.po +++ b/modules/AuthCrypt/locale/bg/LC_MESSAGES/AuthCrypt.po @@ -17,7 +17,7 @@ msgstr "" "Language: bg\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#. TRANS: Plugin description. -#: AuthCryptPlugin.php:157 +#. TRANS: Module description. +#: AuthCryptModule.php:157 msgid "Authentication and password hashing with crypt()" msgstr "" diff --git a/modules/AuthCrypt/locale/bn_IN/LC_MESSAGES/AuthCrypt.po b/modules/AuthCrypt/locale/bn_IN/LC_MESSAGES/AuthCrypt.po index a41a84924c..e896ada7d1 100644 --- a/modules/AuthCrypt/locale/bn_IN/LC_MESSAGES/AuthCrypt.po +++ b/modules/AuthCrypt/locale/bn_IN/LC_MESSAGES/AuthCrypt.po @@ -17,7 +17,7 @@ msgstr "" "Language: bn_IN\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#. TRANS: Plugin description. -#: AuthCryptPlugin.php:157 +#. TRANS: Module description. +#: AuthCryptModule.php:157 msgid "Authentication and password hashing with crypt()" msgstr "" diff --git a/modules/AuthCrypt/locale/br/LC_MESSAGES/AuthCrypt.po b/modules/AuthCrypt/locale/br/LC_MESSAGES/AuthCrypt.po index 3f26d9106b..ef6a0973b8 100644 --- a/modules/AuthCrypt/locale/br/LC_MESSAGES/AuthCrypt.po +++ b/modules/AuthCrypt/locale/br/LC_MESSAGES/AuthCrypt.po @@ -17,7 +17,7 @@ msgstr "" "Language: br\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#. TRANS: Plugin description. -#: AuthCryptPlugin.php:157 +#. TRANS: Module description. +#: AuthCryptModule.php:157 msgid "Authentication and password hashing with crypt()" msgstr "" diff --git a/modules/AuthCrypt/locale/ca/LC_MESSAGES/AuthCrypt.po b/modules/AuthCrypt/locale/ca/LC_MESSAGES/AuthCrypt.po index 368245a661..dd352cbb4f 100644 --- a/modules/AuthCrypt/locale/ca/LC_MESSAGES/AuthCrypt.po +++ b/modules/AuthCrypt/locale/ca/LC_MESSAGES/AuthCrypt.po @@ -17,7 +17,7 @@ msgstr "" "Language: ca\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#. TRANS: Plugin description. -#: AuthCryptPlugin.php:157 +#. TRANS: Module description. +#: AuthCryptModule.php:157 msgid "Authentication and password hashing with crypt()" msgstr "" diff --git a/modules/AuthCrypt/locale/cs/LC_MESSAGES/AuthCrypt.po b/modules/AuthCrypt/locale/cs/LC_MESSAGES/AuthCrypt.po index 8cf411cf09..a0c0944bd0 100644 --- a/modules/AuthCrypt/locale/cs/LC_MESSAGES/AuthCrypt.po +++ b/modules/AuthCrypt/locale/cs/LC_MESSAGES/AuthCrypt.po @@ -17,7 +17,7 @@ msgstr "" "Language: cs\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -#. TRANS: Plugin description. -#: AuthCryptPlugin.php:157 +#. TRANS: Module description. +#: AuthCryptModule.php:157 msgid "Authentication and password hashing with crypt()" msgstr "" diff --git a/modules/AuthCrypt/locale/da/LC_MESSAGES/AuthCrypt.po b/modules/AuthCrypt/locale/da/LC_MESSAGES/AuthCrypt.po index 5e09a6e64a..cf207183d5 100644 --- a/modules/AuthCrypt/locale/da/LC_MESSAGES/AuthCrypt.po +++ b/modules/AuthCrypt/locale/da/LC_MESSAGES/AuthCrypt.po @@ -17,7 +17,7 @@ msgstr "" "Language: da\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#. TRANS: Plugin description. -#: AuthCryptPlugin.php:157 +#. TRANS: Module description. +#: AuthCryptModule.php:157 msgid "Authentication and password hashing with crypt()" msgstr "" diff --git a/modules/AuthCrypt/locale/de/LC_MESSAGES/AuthCrypt.po b/modules/AuthCrypt/locale/de/LC_MESSAGES/AuthCrypt.po index 619a231431..b793a4a2d1 100644 --- a/modules/AuthCrypt/locale/de/LC_MESSAGES/AuthCrypt.po +++ b/modules/AuthCrypt/locale/de/LC_MESSAGES/AuthCrypt.po @@ -17,7 +17,7 @@ msgstr "" "Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#. TRANS: Plugin description. -#: AuthCryptPlugin.php:157 +#. TRANS: Module description. +#: AuthCryptModule.php:157 msgid "Authentication and password hashing with crypt()" msgstr "" diff --git a/modules/AuthCrypt/locale/el/LC_MESSAGES/AuthCrypt.po b/modules/AuthCrypt/locale/el/LC_MESSAGES/AuthCrypt.po index cbef720eef..e1415720da 100644 --- a/modules/AuthCrypt/locale/el/LC_MESSAGES/AuthCrypt.po +++ b/modules/AuthCrypt/locale/el/LC_MESSAGES/AuthCrypt.po @@ -17,7 +17,7 @@ msgstr "" "Language: el\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#. TRANS: Plugin description. -#: AuthCryptPlugin.php:157 +#. TRANS: Module description. +#: AuthCryptModule.php:157 msgid "Authentication and password hashing with crypt()" msgstr "" diff --git a/modules/AuthCrypt/locale/en_GB/LC_MESSAGES/AuthCrypt.po b/modules/AuthCrypt/locale/en_GB/LC_MESSAGES/AuthCrypt.po index df18f2c575..c891857c8d 100644 --- a/modules/AuthCrypt/locale/en_GB/LC_MESSAGES/AuthCrypt.po +++ b/modules/AuthCrypt/locale/en_GB/LC_MESSAGES/AuthCrypt.po @@ -18,7 +18,7 @@ msgstr "" "Language: en_GB\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#. TRANS: Plugin description. -#: AuthCryptPlugin.php:157 +#. TRANS: Module description. +#: AuthCryptModule.php:157 msgid "Authentication and password hashing with crypt()" msgstr "Authentication and password hashing with crypt()" diff --git a/modules/AuthCrypt/locale/eo/LC_MESSAGES/AuthCrypt.po b/modules/AuthCrypt/locale/eo/LC_MESSAGES/AuthCrypt.po index cf9ed82453..8eddc5d2b9 100644 --- a/modules/AuthCrypt/locale/eo/LC_MESSAGES/AuthCrypt.po +++ b/modules/AuthCrypt/locale/eo/LC_MESSAGES/AuthCrypt.po @@ -17,7 +17,7 @@ msgstr "" "Language: eo\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#. TRANS: Plugin description. -#: AuthCryptPlugin.php:157 +#. TRANS: Module description. +#: AuthCryptModule.php:157 msgid "Authentication and password hashing with crypt()" msgstr "" diff --git a/modules/AuthCrypt/locale/es/LC_MESSAGES/AuthCrypt.po b/modules/AuthCrypt/locale/es/LC_MESSAGES/AuthCrypt.po index f56f889fdc..536a446ed3 100644 --- a/modules/AuthCrypt/locale/es/LC_MESSAGES/AuthCrypt.po +++ b/modules/AuthCrypt/locale/es/LC_MESSAGES/AuthCrypt.po @@ -18,7 +18,7 @@ msgstr "" "Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#. TRANS: Plugin description. -#: AuthCryptPlugin.php:157 +#. TRANS: Module description. +#: AuthCryptModule.php:157 msgid "Authentication and password hashing with crypt()" msgstr "Autenticación y cifrado hash de contraseñas con crypt()" diff --git a/modules/AuthCrypt/locale/eu/LC_MESSAGES/AuthCrypt.po b/modules/AuthCrypt/locale/eu/LC_MESSAGES/AuthCrypt.po index 9325a83c6f..340cee74a0 100644 --- a/modules/AuthCrypt/locale/eu/LC_MESSAGES/AuthCrypt.po +++ b/modules/AuthCrypt/locale/eu/LC_MESSAGES/AuthCrypt.po @@ -17,7 +17,7 @@ msgstr "" "Language: eu\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#. TRANS: Plugin description. -#: AuthCryptPlugin.php:157 +#. TRANS: Module description. +#: AuthCryptModule.php:157 msgid "Authentication and password hashing with crypt()" msgstr "" diff --git a/modules/AuthCrypt/locale/fa/LC_MESSAGES/AuthCrypt.po b/modules/AuthCrypt/locale/fa/LC_MESSAGES/AuthCrypt.po index a7e5937f9e..7616d366fd 100644 --- a/modules/AuthCrypt/locale/fa/LC_MESSAGES/AuthCrypt.po +++ b/modules/AuthCrypt/locale/fa/LC_MESSAGES/AuthCrypt.po @@ -17,7 +17,7 @@ msgstr "" "Language: fa\n" "Plural-Forms: nplurals=1; plural=0;\n" -#. TRANS: Plugin description. -#: AuthCryptPlugin.php:157 +#. TRANS: Module description. +#: AuthCryptModule.php:157 msgid "Authentication and password hashing with crypt()" msgstr "" diff --git a/modules/AuthCrypt/locale/fi/LC_MESSAGES/AuthCrypt.po b/modules/AuthCrypt/locale/fi/LC_MESSAGES/AuthCrypt.po index 8dfa2946b2..73b403cc71 100644 --- a/modules/AuthCrypt/locale/fi/LC_MESSAGES/AuthCrypt.po +++ b/modules/AuthCrypt/locale/fi/LC_MESSAGES/AuthCrypt.po @@ -17,7 +17,7 @@ msgstr "" "Language: fi\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#. TRANS: Plugin description. -#: AuthCryptPlugin.php:157 +#. TRANS: Module description. +#: AuthCryptModule.php:157 msgid "Authentication and password hashing with crypt()" msgstr "" diff --git a/modules/AuthCrypt/locale/fr/LC_MESSAGES/AuthCrypt.po b/modules/AuthCrypt/locale/fr/LC_MESSAGES/AuthCrypt.po index cf7763db45..4e11b83ac7 100644 --- a/modules/AuthCrypt/locale/fr/LC_MESSAGES/AuthCrypt.po +++ b/modules/AuthCrypt/locale/fr/LC_MESSAGES/AuthCrypt.po @@ -18,7 +18,7 @@ msgstr "" "Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#. TRANS: Plugin description. -#: AuthCryptPlugin.php:157 +#. TRANS: Module description. +#: AuthCryptModule.php:157 msgid "Authentication and password hashing with crypt()" msgstr "Authentification et mot de passe avec hachage crypt()" diff --git a/modules/AuthCrypt/locale/fur/LC_MESSAGES/AuthCrypt.po b/modules/AuthCrypt/locale/fur/LC_MESSAGES/AuthCrypt.po index 86cb803868..c2d86a0dee 100644 --- a/modules/AuthCrypt/locale/fur/LC_MESSAGES/AuthCrypt.po +++ b/modules/AuthCrypt/locale/fur/LC_MESSAGES/AuthCrypt.po @@ -17,7 +17,7 @@ msgstr "" "Language: fur\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#. TRANS: Plugin description. -#: AuthCryptPlugin.php:157 +#. TRANS: Module description. +#: AuthCryptModule.php:157 msgid "Authentication and password hashing with crypt()" msgstr "" diff --git a/modules/AuthCrypt/locale/gl/LC_MESSAGES/AuthCrypt.po b/modules/AuthCrypt/locale/gl/LC_MESSAGES/AuthCrypt.po index 9d613b9a3d..03861d1a64 100644 --- a/modules/AuthCrypt/locale/gl/LC_MESSAGES/AuthCrypt.po +++ b/modules/AuthCrypt/locale/gl/LC_MESSAGES/AuthCrypt.po @@ -17,7 +17,7 @@ msgstr "" "Language: gl\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#. TRANS: Plugin description. -#: AuthCryptPlugin.php:157 +#. TRANS: Module description. +#: AuthCryptModule.php:157 msgid "Authentication and password hashing with crypt()" msgstr "" diff --git a/modules/AuthCrypt/locale/he/LC_MESSAGES/AuthCrypt.po b/modules/AuthCrypt/locale/he/LC_MESSAGES/AuthCrypt.po index 082b0364dc..c15c7b0e13 100644 --- a/modules/AuthCrypt/locale/he/LC_MESSAGES/AuthCrypt.po +++ b/modules/AuthCrypt/locale/he/LC_MESSAGES/AuthCrypt.po @@ -17,7 +17,7 @@ msgstr "" "Language: he\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#. TRANS: Plugin description. -#: AuthCryptPlugin.php:157 +#. TRANS: Module description. +#: AuthCryptModule.php:157 msgid "Authentication and password hashing with crypt()" msgstr "" diff --git a/modules/AuthCrypt/locale/hsb/LC_MESSAGES/AuthCrypt.po b/modules/AuthCrypt/locale/hsb/LC_MESSAGES/AuthCrypt.po index 2548d8584b..60416aa002 100644 --- a/modules/AuthCrypt/locale/hsb/LC_MESSAGES/AuthCrypt.po +++ b/modules/AuthCrypt/locale/hsb/LC_MESSAGES/AuthCrypt.po @@ -17,7 +17,7 @@ msgstr "" "Language: hsb\n" "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n" -#. TRANS: Plugin description. -#: AuthCryptPlugin.php:157 +#. TRANS: Module description. +#: AuthCryptModule.php:157 msgid "Authentication and password hashing with crypt()" msgstr "" diff --git a/modules/AuthCrypt/locale/hu/LC_MESSAGES/AuthCrypt.po b/modules/AuthCrypt/locale/hu/LC_MESSAGES/AuthCrypt.po index 350fe033ff..119c86fffa 100644 --- a/modules/AuthCrypt/locale/hu/LC_MESSAGES/AuthCrypt.po +++ b/modules/AuthCrypt/locale/hu/LC_MESSAGES/AuthCrypt.po @@ -17,7 +17,7 @@ msgstr "" "Language: hu\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#. TRANS: Plugin description. -#: AuthCryptPlugin.php:157 +#. TRANS: Module description. +#: AuthCryptModule.php:157 msgid "Authentication and password hashing with crypt()" msgstr "" diff --git a/modules/AuthCrypt/locale/hy_AM/LC_MESSAGES/AuthCrypt.po b/modules/AuthCrypt/locale/hy_AM/LC_MESSAGES/AuthCrypt.po index ee33d0d0a1..d12d811cae 100644 --- a/modules/AuthCrypt/locale/hy_AM/LC_MESSAGES/AuthCrypt.po +++ b/modules/AuthCrypt/locale/hy_AM/LC_MESSAGES/AuthCrypt.po @@ -17,7 +17,7 @@ msgstr "" "Language: hy_AM\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#. TRANS: Plugin description. -#: AuthCryptPlugin.php:157 +#. TRANS: Module description. +#: AuthCryptModule.php:157 msgid "Authentication and password hashing with crypt()" msgstr "" diff --git a/modules/AuthCrypt/locale/ia/LC_MESSAGES/AuthCrypt.po b/modules/AuthCrypt/locale/ia/LC_MESSAGES/AuthCrypt.po index 31c3400d1b..2e728e4e3f 100644 --- a/modules/AuthCrypt/locale/ia/LC_MESSAGES/AuthCrypt.po +++ b/modules/AuthCrypt/locale/ia/LC_MESSAGES/AuthCrypt.po @@ -17,7 +17,7 @@ msgstr "" "Language: ia\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#. TRANS: Plugin description. -#: AuthCryptPlugin.php:157 +#. TRANS: Module description. +#: AuthCryptModule.php:157 msgid "Authentication and password hashing with crypt()" msgstr "" diff --git a/modules/AuthCrypt/locale/id/LC_MESSAGES/AuthCrypt.po b/modules/AuthCrypt/locale/id/LC_MESSAGES/AuthCrypt.po index 6381896017..9ae9efc444 100644 --- a/modules/AuthCrypt/locale/id/LC_MESSAGES/AuthCrypt.po +++ b/modules/AuthCrypt/locale/id/LC_MESSAGES/AuthCrypt.po @@ -18,7 +18,7 @@ msgstr "" "Language: id\n" "Plural-Forms: nplurals=1; plural=0;\n" -#. TRANS: Plugin description. -#: AuthCryptPlugin.php:157 +#. TRANS: Module description. +#: AuthCryptModule.php:157 msgid "Authentication and password hashing with crypt()" msgstr "Otentikasi dan hash sandi dengan crypt()" diff --git a/modules/AuthCrypt/locale/io/LC_MESSAGES/AuthCrypt.po b/modules/AuthCrypt/locale/io/LC_MESSAGES/AuthCrypt.po index 1abd4febb2..c083ba9309 100644 --- a/modules/AuthCrypt/locale/io/LC_MESSAGES/AuthCrypt.po +++ b/modules/AuthCrypt/locale/io/LC_MESSAGES/AuthCrypt.po @@ -18,7 +18,7 @@ msgstr "" "Language: io\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#. TRANS: Plugin description. -#: AuthCryptPlugin.php:157 +#. TRANS: Module description. +#: AuthCryptModule.php:157 msgid "Authentication and password hashing with crypt()" msgstr "Autentikigo- e pasovorto-hacho per crypt()" diff --git a/modules/AuthCrypt/locale/is/LC_MESSAGES/AuthCrypt.po b/modules/AuthCrypt/locale/is/LC_MESSAGES/AuthCrypt.po index 3f08a2a80c..95591e03af 100644 --- a/modules/AuthCrypt/locale/is/LC_MESSAGES/AuthCrypt.po +++ b/modules/AuthCrypt/locale/is/LC_MESSAGES/AuthCrypt.po @@ -17,7 +17,7 @@ msgstr "" "Language: is\n" "Plural-Forms: nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);\n" -#. TRANS: Plugin description. -#: AuthCryptPlugin.php:157 +#. TRANS: Module description. +#: AuthCryptModule.php:157 msgid "Authentication and password hashing with crypt()" msgstr "" diff --git a/modules/AuthCrypt/locale/it/LC_MESSAGES/AuthCrypt.po b/modules/AuthCrypt/locale/it/LC_MESSAGES/AuthCrypt.po index 3e9b55079a..89330dd493 100644 --- a/modules/AuthCrypt/locale/it/LC_MESSAGES/AuthCrypt.po +++ b/modules/AuthCrypt/locale/it/LC_MESSAGES/AuthCrypt.po @@ -17,7 +17,7 @@ msgstr "" "Language: it\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#. TRANS: Plugin description. -#: AuthCryptPlugin.php:157 +#. TRANS: Module description. +#: AuthCryptModule.php:157 msgid "Authentication and password hashing with crypt()" msgstr "" diff --git a/modules/AuthCrypt/locale/ja/LC_MESSAGES/AuthCrypt.po b/modules/AuthCrypt/locale/ja/LC_MESSAGES/AuthCrypt.po index b75882126d..5a8ed51427 100644 --- a/modules/AuthCrypt/locale/ja/LC_MESSAGES/AuthCrypt.po +++ b/modules/AuthCrypt/locale/ja/LC_MESSAGES/AuthCrypt.po @@ -17,7 +17,7 @@ msgstr "" "Language: ja\n" "Plural-Forms: nplurals=1; plural=0;\n" -#. TRANS: Plugin description. -#: AuthCryptPlugin.php:157 +#. TRANS: Module description. +#: AuthCryptModule.php:157 msgid "Authentication and password hashing with crypt()" msgstr "" diff --git a/modules/AuthCrypt/locale/ka/LC_MESSAGES/AuthCrypt.po b/modules/AuthCrypt/locale/ka/LC_MESSAGES/AuthCrypt.po index cc684fdf82..28f6dd80aa 100644 --- a/modules/AuthCrypt/locale/ka/LC_MESSAGES/AuthCrypt.po +++ b/modules/AuthCrypt/locale/ka/LC_MESSAGES/AuthCrypt.po @@ -17,7 +17,7 @@ msgstr "" "Language: ka\n" "Plural-Forms: nplurals=1; plural=0;\n" -#. TRANS: Plugin description. -#: AuthCryptPlugin.php:157 +#. TRANS: Module description. +#: AuthCryptModule.php:157 msgid "Authentication and password hashing with crypt()" msgstr "" diff --git a/modules/AuthCrypt/locale/ko/LC_MESSAGES/AuthCrypt.po b/modules/AuthCrypt/locale/ko/LC_MESSAGES/AuthCrypt.po index 37f17635a0..7b93c31192 100644 --- a/modules/AuthCrypt/locale/ko/LC_MESSAGES/AuthCrypt.po +++ b/modules/AuthCrypt/locale/ko/LC_MESSAGES/AuthCrypt.po @@ -17,7 +17,7 @@ msgstr "" "Language: ko\n" "Plural-Forms: nplurals=1; plural=0;\n" -#. TRANS: Plugin description. -#: AuthCryptPlugin.php:157 +#. TRANS: Module description. +#: AuthCryptModule.php:157 msgid "Authentication and password hashing with crypt()" msgstr "" diff --git a/modules/AuthCrypt/locale/ksh/LC_MESSAGES/AuthCrypt.po b/modules/AuthCrypt/locale/ksh/LC_MESSAGES/AuthCrypt.po index c21035e4c9..dfd674d84a 100644 --- a/modules/AuthCrypt/locale/ksh/LC_MESSAGES/AuthCrypt.po +++ b/modules/AuthCrypt/locale/ksh/LC_MESSAGES/AuthCrypt.po @@ -17,7 +17,7 @@ msgstr "" "Language: ksh\n" "Plural-Forms: nplurals=3; plural=(n==0) ? 0 : (n==1) ? 1 : 2;\n" -#. TRANS: Plugin description. -#: AuthCryptPlugin.php:157 +#. TRANS: Module description. +#: AuthCryptModule.php:157 msgid "Authentication and password hashing with crypt()" msgstr "" diff --git a/modules/AuthCrypt/locale/lb/LC_MESSAGES/AuthCrypt.po b/modules/AuthCrypt/locale/lb/LC_MESSAGES/AuthCrypt.po index 6a3c2ea145..f2ce4635f0 100644 --- a/modules/AuthCrypt/locale/lb/LC_MESSAGES/AuthCrypt.po +++ b/modules/AuthCrypt/locale/lb/LC_MESSAGES/AuthCrypt.po @@ -17,7 +17,7 @@ msgstr "" "Language: lb\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#. TRANS: Plugin description. -#: AuthCryptPlugin.php:157 +#. TRANS: Module description. +#: AuthCryptModule.php:157 msgid "Authentication and password hashing with crypt()" msgstr "" diff --git a/modules/AuthCrypt/locale/lt/LC_MESSAGES/AuthCrypt.po b/modules/AuthCrypt/locale/lt/LC_MESSAGES/AuthCrypt.po index 04cdc89c44..f7b37b2e77 100644 --- a/modules/AuthCrypt/locale/lt/LC_MESSAGES/AuthCrypt.po +++ b/modules/AuthCrypt/locale/lt/LC_MESSAGES/AuthCrypt.po @@ -17,7 +17,7 @@ msgstr "" "Language: lt\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#. TRANS: Plugin description. -#: AuthCryptPlugin.php:157 +#. TRANS: Module description. +#: AuthCryptModule.php:157 msgid "Authentication and password hashing with crypt()" msgstr "" diff --git a/modules/AuthCrypt/locale/lv/LC_MESSAGES/AuthCrypt.po b/modules/AuthCrypt/locale/lv/LC_MESSAGES/AuthCrypt.po index 02376d3ec7..95435397f0 100644 --- a/modules/AuthCrypt/locale/lv/LC_MESSAGES/AuthCrypt.po +++ b/modules/AuthCrypt/locale/lv/LC_MESSAGES/AuthCrypt.po @@ -17,7 +17,7 @@ msgstr "" "Language: lv\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n" -#. TRANS: Plugin description. -#: AuthCryptPlugin.php:157 +#. TRANS: Module description. +#: AuthCryptModule.php:157 msgid "Authentication and password hashing with crypt()" msgstr "" diff --git a/modules/AuthCrypt/locale/mg/LC_MESSAGES/AuthCrypt.po b/modules/AuthCrypt/locale/mg/LC_MESSAGES/AuthCrypt.po index 6db822710d..77b0d1a555 100644 --- a/modules/AuthCrypt/locale/mg/LC_MESSAGES/AuthCrypt.po +++ b/modules/AuthCrypt/locale/mg/LC_MESSAGES/AuthCrypt.po @@ -17,7 +17,7 @@ msgstr "" "Language: mg\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#. TRANS: Plugin description. -#: AuthCryptPlugin.php:157 +#. TRANS: Module description. +#: AuthCryptModule.php:157 msgid "Authentication and password hashing with crypt()" msgstr "" diff --git a/modules/AuthCrypt/locale/mk/LC_MESSAGES/AuthCrypt.po b/modules/AuthCrypt/locale/mk/LC_MESSAGES/AuthCrypt.po index 8d2e1249b6..1e8e86ace0 100644 --- a/modules/AuthCrypt/locale/mk/LC_MESSAGES/AuthCrypt.po +++ b/modules/AuthCrypt/locale/mk/LC_MESSAGES/AuthCrypt.po @@ -17,7 +17,7 @@ msgstr "" "Language: mk\n" "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n" -#. TRANS: Plugin description. -#: AuthCryptPlugin.php:157 +#. TRANS: Module description. +#: AuthCryptModule.php:157 msgid "Authentication and password hashing with crypt()" msgstr "" diff --git a/modules/AuthCrypt/locale/ml/LC_MESSAGES/AuthCrypt.po b/modules/AuthCrypt/locale/ml/LC_MESSAGES/AuthCrypt.po index fd190478cb..6f906ad262 100644 --- a/modules/AuthCrypt/locale/ml/LC_MESSAGES/AuthCrypt.po +++ b/modules/AuthCrypt/locale/ml/LC_MESSAGES/AuthCrypt.po @@ -17,7 +17,7 @@ msgstr "" "Language: ml\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#. TRANS: Plugin description. -#: AuthCryptPlugin.php:157 +#. TRANS: Module description. +#: AuthCryptModule.php:157 msgid "Authentication and password hashing with crypt()" msgstr "" diff --git a/modules/AuthCrypt/locale/ms/LC_MESSAGES/AuthCrypt.po b/modules/AuthCrypt/locale/ms/LC_MESSAGES/AuthCrypt.po index a2390423c0..8c04c42dde 100644 --- a/modules/AuthCrypt/locale/ms/LC_MESSAGES/AuthCrypt.po +++ b/modules/AuthCrypt/locale/ms/LC_MESSAGES/AuthCrypt.po @@ -17,7 +17,7 @@ msgstr "" "Language: ms\n" "Plural-Forms: nplurals=1; plural=0;\n" -#. TRANS: Plugin description. -#: AuthCryptPlugin.php:157 +#. TRANS: Module description. +#: AuthCryptModule.php:157 msgid "Authentication and password hashing with crypt()" msgstr "" diff --git a/modules/AuthCrypt/locale/my/LC_MESSAGES/AuthCrypt.po b/modules/AuthCrypt/locale/my/LC_MESSAGES/AuthCrypt.po index 067d8e6b6d..ce3b0c2976 100644 --- a/modules/AuthCrypt/locale/my/LC_MESSAGES/AuthCrypt.po +++ b/modules/AuthCrypt/locale/my/LC_MESSAGES/AuthCrypt.po @@ -17,7 +17,7 @@ msgstr "" "Language: my\n" "Plural-Forms: nplurals=1; plural=0;\n" -#. TRANS: Plugin description. -#: AuthCryptPlugin.php:157 +#. TRANS: Module description. +#: AuthCryptModule.php:157 msgid "Authentication and password hashing with crypt()" msgstr "" diff --git a/modules/AuthCrypt/locale/nb/LC_MESSAGES/AuthCrypt.po b/modules/AuthCrypt/locale/nb/LC_MESSAGES/AuthCrypt.po index 801339130b..98f54c78d8 100644 --- a/modules/AuthCrypt/locale/nb/LC_MESSAGES/AuthCrypt.po +++ b/modules/AuthCrypt/locale/nb/LC_MESSAGES/AuthCrypt.po @@ -17,7 +17,7 @@ msgstr "" "Language: nb\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#. TRANS: Plugin description. -#: AuthCryptPlugin.php:157 +#. TRANS: Module description. +#: AuthCryptModule.php:157 msgid "Authentication and password hashing with crypt()" msgstr "" diff --git a/modules/AuthCrypt/locale/ne/LC_MESSAGES/AuthCrypt.po b/modules/AuthCrypt/locale/ne/LC_MESSAGES/AuthCrypt.po index b86d6f58d5..e4fc9d00af 100644 --- a/modules/AuthCrypt/locale/ne/LC_MESSAGES/AuthCrypt.po +++ b/modules/AuthCrypt/locale/ne/LC_MESSAGES/AuthCrypt.po @@ -17,7 +17,7 @@ msgstr "" "Language: ne\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#. TRANS: Plugin description. -#: AuthCryptPlugin.php:157 +#. TRANS: Module description. +#: AuthCryptModule.php:157 msgid "Authentication and password hashing with crypt()" msgstr "" diff --git a/modules/AuthCrypt/locale/nl/LC_MESSAGES/AuthCrypt.po b/modules/AuthCrypt/locale/nl/LC_MESSAGES/AuthCrypt.po index ed326e8e65..6d98cb202c 100644 --- a/modules/AuthCrypt/locale/nl/LC_MESSAGES/AuthCrypt.po +++ b/modules/AuthCrypt/locale/nl/LC_MESSAGES/AuthCrypt.po @@ -17,7 +17,7 @@ msgstr "" "Language: nl\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#. TRANS: Plugin description. -#: AuthCryptPlugin.php:157 +#. TRANS: Module description. +#: AuthCryptModule.php:157 msgid "Authentication and password hashing with crypt()" msgstr "" diff --git a/modules/AuthCrypt/locale/nn/LC_MESSAGES/AuthCrypt.po b/modules/AuthCrypt/locale/nn/LC_MESSAGES/AuthCrypt.po index f1f4c7a2a2..a27062bfd5 100644 --- a/modules/AuthCrypt/locale/nn/LC_MESSAGES/AuthCrypt.po +++ b/modules/AuthCrypt/locale/nn/LC_MESSAGES/AuthCrypt.po @@ -17,7 +17,7 @@ msgstr "" "Language: nn\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#. TRANS: Plugin description. -#: AuthCryptPlugin.php:157 +#. TRANS: Module description. +#: AuthCryptModule.php:157 msgid "Authentication and password hashing with crypt()" msgstr "" diff --git a/modules/AuthCrypt/locale/pl/LC_MESSAGES/AuthCrypt.po b/modules/AuthCrypt/locale/pl/LC_MESSAGES/AuthCrypt.po index 68621490c5..b45d359bd2 100644 --- a/modules/AuthCrypt/locale/pl/LC_MESSAGES/AuthCrypt.po +++ b/modules/AuthCrypt/locale/pl/LC_MESSAGES/AuthCrypt.po @@ -17,7 +17,7 @@ msgstr "" "Language: pl\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#. TRANS: Plugin description. -#: AuthCryptPlugin.php:157 +#. TRANS: Module description. +#: AuthCryptModule.php:157 msgid "Authentication and password hashing with crypt()" msgstr "" diff --git a/modules/AuthCrypt/locale/pt/LC_MESSAGES/AuthCrypt.po b/modules/AuthCrypt/locale/pt/LC_MESSAGES/AuthCrypt.po index b9218916ec..aaecf90df3 100644 --- a/modules/AuthCrypt/locale/pt/LC_MESSAGES/AuthCrypt.po +++ b/modules/AuthCrypt/locale/pt/LC_MESSAGES/AuthCrypt.po @@ -17,7 +17,7 @@ msgstr "" "Language: pt\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#. TRANS: Plugin description. -#: AuthCryptPlugin.php:157 +#. TRANS: Module description. +#: AuthCryptModule.php:157 msgid "Authentication and password hashing with crypt()" msgstr "" diff --git a/modules/AuthCrypt/locale/pt_BR/LC_MESSAGES/AuthCrypt.po b/modules/AuthCrypt/locale/pt_BR/LC_MESSAGES/AuthCrypt.po index 6d6c9bcfeb..a9204e3697 100644 --- a/modules/AuthCrypt/locale/pt_BR/LC_MESSAGES/AuthCrypt.po +++ b/modules/AuthCrypt/locale/pt_BR/LC_MESSAGES/AuthCrypt.po @@ -17,7 +17,7 @@ msgstr "" "Language: pt_BR\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#. TRANS: Plugin description. -#: AuthCryptPlugin.php:157 +#. TRANS: Module description. +#: AuthCryptModule.php:157 msgid "Authentication and password hashing with crypt()" msgstr "" diff --git a/modules/AuthCrypt/locale/ro_RO/LC_MESSAGES/AuthCrypt.po b/modules/AuthCrypt/locale/ro_RO/LC_MESSAGES/AuthCrypt.po index ee22f63a79..eb4fa1a42f 100644 --- a/modules/AuthCrypt/locale/ro_RO/LC_MESSAGES/AuthCrypt.po +++ b/modules/AuthCrypt/locale/ro_RO/LC_MESSAGES/AuthCrypt.po @@ -17,7 +17,7 @@ msgstr "" "Language: ro_RO\n" "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n" -#. TRANS: Plugin description. -#: AuthCryptPlugin.php:157 +#. TRANS: Module description. +#: AuthCryptModule.php:157 msgid "Authentication and password hashing with crypt()" msgstr "" diff --git a/modules/AuthCrypt/locale/ru/LC_MESSAGES/AuthCrypt.po b/modules/AuthCrypt/locale/ru/LC_MESSAGES/AuthCrypt.po index d85d905d99..b9c882ca24 100644 --- a/modules/AuthCrypt/locale/ru/LC_MESSAGES/AuthCrypt.po +++ b/modules/AuthCrypt/locale/ru/LC_MESSAGES/AuthCrypt.po @@ -18,7 +18,7 @@ msgstr "" "Language: ru\n" "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n" -#. TRANS: Plugin description. -#: AuthCryptPlugin.php:157 +#. TRANS: Module description. +#: AuthCryptModule.php:157 msgid "Authentication and password hashing with crypt()" msgstr "Хэшинг авторизации и пароля при помощи crypt()" diff --git a/modules/AuthCrypt/locale/sl/LC_MESSAGES/AuthCrypt.po b/modules/AuthCrypt/locale/sl/LC_MESSAGES/AuthCrypt.po index 5b4d7e70e9..35cdf65a41 100644 --- a/modules/AuthCrypt/locale/sl/LC_MESSAGES/AuthCrypt.po +++ b/modules/AuthCrypt/locale/sl/LC_MESSAGES/AuthCrypt.po @@ -17,7 +17,7 @@ msgstr "" "Language: sl\n" "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n" -#. TRANS: Plugin description. -#: AuthCryptPlugin.php:157 +#. TRANS: Module description. +#: AuthCryptModule.php:157 msgid "Authentication and password hashing with crypt()" msgstr "" diff --git a/modules/AuthCrypt/locale/sr-ec/LC_MESSAGES/AuthCrypt.po b/modules/AuthCrypt/locale/sr-ec/LC_MESSAGES/AuthCrypt.po index ac3b9d3885..581c9ce912 100644 --- a/modules/AuthCrypt/locale/sr-ec/LC_MESSAGES/AuthCrypt.po +++ b/modules/AuthCrypt/locale/sr-ec/LC_MESSAGES/AuthCrypt.po @@ -17,7 +17,7 @@ msgstr "" "Language: sr\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#. TRANS: Plugin description. -#: AuthCryptPlugin.php:157 +#. TRANS: Module description. +#: AuthCryptModule.php:157 msgid "Authentication and password hashing with crypt()" msgstr "" diff --git a/modules/AuthCrypt/locale/sv/LC_MESSAGES/AuthCrypt.po b/modules/AuthCrypt/locale/sv/LC_MESSAGES/AuthCrypt.po index bf26b23cb4..a8da8c527d 100644 --- a/modules/AuthCrypt/locale/sv/LC_MESSAGES/AuthCrypt.po +++ b/modules/AuthCrypt/locale/sv/LC_MESSAGES/AuthCrypt.po @@ -18,7 +18,7 @@ msgstr "" "Language: sv\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#. TRANS: Plugin description. -#: AuthCryptPlugin.php:157 +#. TRANS: Module description. +#: AuthCryptModule.php:157 msgid "Authentication and password hashing with crypt()" msgstr "Autensiering och lösenordshashning med crypt()" diff --git a/modules/AuthCrypt/locale/ta/LC_MESSAGES/AuthCrypt.po b/modules/AuthCrypt/locale/ta/LC_MESSAGES/AuthCrypt.po index 5be212f92e..00cb36b7c7 100644 --- a/modules/AuthCrypt/locale/ta/LC_MESSAGES/AuthCrypt.po +++ b/modules/AuthCrypt/locale/ta/LC_MESSAGES/AuthCrypt.po @@ -17,7 +17,7 @@ msgstr "" "Language: ta\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#. TRANS: Plugin description. -#: AuthCryptPlugin.php:157 +#. TRANS: Module description. +#: AuthCryptModule.php:157 msgid "Authentication and password hashing with crypt()" msgstr "" diff --git a/modules/AuthCrypt/locale/te/LC_MESSAGES/AuthCrypt.po b/modules/AuthCrypt/locale/te/LC_MESSAGES/AuthCrypt.po index c6a8753ca6..b3a5a292d1 100644 --- a/modules/AuthCrypt/locale/te/LC_MESSAGES/AuthCrypt.po +++ b/modules/AuthCrypt/locale/te/LC_MESSAGES/AuthCrypt.po @@ -17,7 +17,7 @@ msgstr "" "Language: te\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#. TRANS: Plugin description. -#: AuthCryptPlugin.php:157 +#. TRANS: Module description. +#: AuthCryptModule.php:157 msgid "Authentication and password hashing with crypt()" msgstr "" diff --git a/modules/AuthCrypt/locale/tl/LC_MESSAGES/AuthCrypt.po b/modules/AuthCrypt/locale/tl/LC_MESSAGES/AuthCrypt.po index 4a93778810..ecc3ebb369 100644 --- a/modules/AuthCrypt/locale/tl/LC_MESSAGES/AuthCrypt.po +++ b/modules/AuthCrypt/locale/tl/LC_MESSAGES/AuthCrypt.po @@ -17,7 +17,7 @@ msgstr "" "Language: tl\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#. TRANS: Plugin description. -#: AuthCryptPlugin.php:157 +#. TRANS: Module description. +#: AuthCryptModule.php:157 msgid "Authentication and password hashing with crypt()" msgstr "" diff --git a/modules/AuthCrypt/locale/tr/LC_MESSAGES/AuthCrypt.po b/modules/AuthCrypt/locale/tr/LC_MESSAGES/AuthCrypt.po index 7fc6645ea8..9396cef28f 100644 --- a/modules/AuthCrypt/locale/tr/LC_MESSAGES/AuthCrypt.po +++ b/modules/AuthCrypt/locale/tr/LC_MESSAGES/AuthCrypt.po @@ -17,7 +17,7 @@ msgstr "" "Language: tr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#. TRANS: Plugin description. -#: AuthCryptPlugin.php:157 +#. TRANS: Module description. +#: AuthCryptModule.php:157 msgid "Authentication and password hashing with crypt()" msgstr "" diff --git a/modules/AuthCrypt/locale/uk/LC_MESSAGES/AuthCrypt.po b/modules/AuthCrypt/locale/uk/LC_MESSAGES/AuthCrypt.po index 37f84e5bc8..35b679e244 100644 --- a/modules/AuthCrypt/locale/uk/LC_MESSAGES/AuthCrypt.po +++ b/modules/AuthCrypt/locale/uk/LC_MESSAGES/AuthCrypt.po @@ -18,7 +18,7 @@ msgstr "" "Language: uk\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#. TRANS: Plugin description. -#: AuthCryptPlugin.php:157 +#. TRANS: Module description. +#: AuthCryptModule.php:157 msgid "Authentication and password hashing with crypt()" msgstr "Логін та пароль хешуються з crypt()" diff --git a/modules/AuthCrypt/locale/ur_PK/LC_MESSAGES/AuthCrypt.po b/modules/AuthCrypt/locale/ur_PK/LC_MESSAGES/AuthCrypt.po index f54516bf12..fb0af3b081 100644 --- a/modules/AuthCrypt/locale/ur_PK/LC_MESSAGES/AuthCrypt.po +++ b/modules/AuthCrypt/locale/ur_PK/LC_MESSAGES/AuthCrypt.po @@ -17,7 +17,7 @@ msgstr "" "Language: ur_PK\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#. TRANS: Plugin description. -#: AuthCryptPlugin.php:157 +#. TRANS: Module description. +#: AuthCryptModule.php:157 msgid "Authentication and password hashing with crypt()" msgstr "" diff --git a/modules/AuthCrypt/locale/vi/LC_MESSAGES/AuthCrypt.po b/modules/AuthCrypt/locale/vi/LC_MESSAGES/AuthCrypt.po index 80b9854f1d..1e81bc862e 100644 --- a/modules/AuthCrypt/locale/vi/LC_MESSAGES/AuthCrypt.po +++ b/modules/AuthCrypt/locale/vi/LC_MESSAGES/AuthCrypt.po @@ -17,7 +17,7 @@ msgstr "" "Language: vi\n" "Plural-Forms: nplurals=1; plural=0;\n" -#. TRANS: Plugin description. -#: AuthCryptPlugin.php:157 +#. TRANS: Module description. +#: AuthCryptModule.php:157 msgid "Authentication and password hashing with crypt()" msgstr "" diff --git a/modules/AuthCrypt/locale/zh/LC_MESSAGES/AuthCrypt.po b/modules/AuthCrypt/locale/zh/LC_MESSAGES/AuthCrypt.po index 9093fd43d5..fdcfd8cb2f 100644 --- a/modules/AuthCrypt/locale/zh/LC_MESSAGES/AuthCrypt.po +++ b/modules/AuthCrypt/locale/zh/LC_MESSAGES/AuthCrypt.po @@ -17,7 +17,7 @@ msgstr "" "Language: zh\n" "Plural-Forms: nplurals=1; plural=0;\n" -#. TRANS: Plugin description. -#: AuthCryptPlugin.php:157 +#. TRANS: Module description. +#: AuthCryptModule.php:157 msgid "Authentication and password hashing with crypt()" msgstr "" diff --git a/modules/AuthCrypt/locale/zh_CN/LC_MESSAGES/AuthCrypt.po b/modules/AuthCrypt/locale/zh_CN/LC_MESSAGES/AuthCrypt.po index 22badffc21..0d580e4594 100644 --- a/modules/AuthCrypt/locale/zh_CN/LC_MESSAGES/AuthCrypt.po +++ b/modules/AuthCrypt/locale/zh_CN/LC_MESSAGES/AuthCrypt.po @@ -17,7 +17,7 @@ msgstr "" "Language: zh_CN\n" "Plural-Forms: nplurals=1; plural=0;\n" -#. TRANS: Plugin description. -#: AuthCryptPlugin.php:157 +#. TRANS: Module description. +#: AuthCryptModule.php:157 msgid "Authentication and password hashing with crypt()" msgstr "" diff --git a/modules/AuthCrypt/locale/zh_TW/LC_MESSAGES/AuthCrypt.po b/modules/AuthCrypt/locale/zh_TW/LC_MESSAGES/AuthCrypt.po index c66ed209ef..f49b5bd48c 100644 --- a/modules/AuthCrypt/locale/zh_TW/LC_MESSAGES/AuthCrypt.po +++ b/modules/AuthCrypt/locale/zh_TW/LC_MESSAGES/AuthCrypt.po @@ -17,7 +17,7 @@ msgstr "" "Language: zh_TW\n" "Plural-Forms: nplurals=1; plural=0;\n" -#. TRANS: Plugin description. -#: AuthCryptPlugin.php:157 +#. TRANS: Module description. +#: AuthCryptModule.php:157 msgid "Authentication and password hashing with crypt()" msgstr "" diff --git a/modules/Favorite/FavoritePlugin.php b/modules/Favorite/FavoriteModule.php similarity index 99% rename from modules/Favorite/FavoritePlugin.php rename to modules/Favorite/FavoriteModule.php index 93e591a88b..9e716592ae 100644 --- a/modules/Favorite/FavoritePlugin.php +++ b/modules/Favorite/FavoriteModule.php @@ -23,7 +23,7 @@ if (!defined('GNUSOCIAL')) { exit(1); } * @package Activity * @maintainer Mikael Nordfeldth */ -class FavoritePlugin extends ActivityVerbHandlerPlugin +class FavoriteModule extends ActivityVerbHandlerModule { const PLUGIN_VERSION = '2.0.0'; @@ -562,7 +562,7 @@ class FavoritePlugin extends ActivityVerbHandlerPlugin : new FavorForm($action, $target); } - public function onPluginVersion(array &$versions) + public function onModuleVersion(array &$versions): bool { $versions[] = array('name' => 'Favorite', 'version' => self::PLUGIN_VERSION, diff --git a/modules/Favorite/actions/atompubfavoritefeed.php b/modules/Favorite/actions/atompubfavoritefeed.php index b8dae707b3..e234f61e98 100644 --- a/modules/Favorite/actions/atompubfavoritefeed.php +++ b/modules/Favorite/actions/atompubfavoritefeed.php @@ -209,7 +209,7 @@ class AtompubfavoritefeedAction extends ApiAuthAction $activity = new Activity($dom->documentElement); $notice = null; - // Favorite plugin handles these as ActivityHandlerPlugin through Notice->saveActivity + // Favorite plugin handles these as ActivityHandlerModule through Notice->saveActivity // which in turn uses "StoreActivityObject" event. Event::handle('StartAtomPubNewActivity', array(&$activity, $this->scoped, &$notice)); assert($notice instanceof Notice); diff --git a/modules/Favorite/locale/Favorite.pot b/modules/Favorite/locale/Favorite.pot index 36fc318845..4439a15974 100644 --- a/modules/Favorite/locale/Favorite.pot +++ b/modules/Favorite/locale/Favorite.pot @@ -45,43 +45,43 @@ msgstr[0] "" msgstr[1] "" #. TRANS: Help message for IM/SMS command "fav ". -#: FavoritePlugin.php:421 +#: FavoriteModule.php:421 msgctxt "COMMANDHELP" msgid "add user's last notice as a 'fave'" msgstr "" #. TRANS: Help message for IM/SMS command "fav #". -#: FavoritePlugin.php:423 +#: FavoriteModule.php:423 msgctxt "COMMANDHELP" msgid "add notice with the given id as a 'fave'" msgstr "" #. TRANS: Menu item in personal group navigation menu. -#: FavoritePlugin.php:473 +#: FavoriteModule.php:473 msgctxt "MENU" msgid "Favorites" msgstr "" #. TRANS: Menu item in search group navigation panel. -#: FavoritePlugin.php:486 +#: FavoriteModule.php:486 msgctxt "MENU" msgid "Popular" msgstr "" #. TRANS: Page/dialog box title when a notice is marked as favorite already -#: FavoritePlugin.php:508 +#: FavoriteModule.php:508 msgctxt "TITLE" msgid "Unmark notice as favorite" msgstr "" #. TRANS: Page/dialog box title when a notice is not marked as favorite -#: FavoritePlugin.php:510 +#: FavoriteModule.php:510 msgctxt "TITLE" msgid "Mark notice as favorite" msgstr "" -#. TRANS: Plugin description. -#: FavoritePlugin.php:568 +#. TRANS: Module description. +#: FavoriteModule.php:568 msgid "Favorites (likes) using ActivityStreams." msgstr "" diff --git a/modules/Favorite/locale/af/LC_MESSAGES/Favorite.po b/modules/Favorite/locale/af/LC_MESSAGES/Favorite.po index 722ae8e437..c314de34f8 100644 --- a/modules/Favorite/locale/af/LC_MESSAGES/Favorite.po +++ b/modules/Favorite/locale/af/LC_MESSAGES/Favorite.po @@ -31,31 +31,31 @@ msgid "Disfavor favorite" msgstr "" #. TRANS: Help message for IM/SMS command "fav ". -#: FavoritePlugin.php:415 +#: FavoriteModule.php:415 msgctxt "COMMANDHELP" msgid "add user's last notice as a 'fave'" msgstr "" #. TRANS: Help message for IM/SMS command "fav #". -#: FavoritePlugin.php:417 +#: FavoriteModule.php:417 msgctxt "COMMANDHELP" msgid "add notice with the given id as a 'fave'" msgstr "" #. TRANS: Menu item in personal group navigation menu. -#: FavoritePlugin.php:469 +#: FavoriteModule.php:469 msgctxt "MENU" msgid "Favorites" msgstr "" #. TRANS: Menu item in search group navigation panel. -#: FavoritePlugin.php:482 +#: FavoriteModule.php:482 msgctxt "MENU" msgid "Popular" msgstr "" -#. TRANS: Plugin description. -#: FavoritePlugin.php:508 +#. TRANS: Module description. +#: FavoriteModule.php:508 msgid "Favorites (likes) using ActivityStreams." msgstr "" diff --git a/modules/Favorite/locale/ar/LC_MESSAGES/Favorite.po b/modules/Favorite/locale/ar/LC_MESSAGES/Favorite.po index 1bd19ba6d3..1c381f9620 100644 --- a/modules/Favorite/locale/ar/LC_MESSAGES/Favorite.po +++ b/modules/Favorite/locale/ar/LC_MESSAGES/Favorite.po @@ -31,31 +31,31 @@ msgid "Disfavor favorite" msgstr "" #. TRANS: Help message for IM/SMS command "fav ". -#: FavoritePlugin.php:415 +#: FavoriteModule.php:415 msgctxt "COMMANDHELP" msgid "add user's last notice as a 'fave'" msgstr "" #. TRANS: Help message for IM/SMS command "fav #". -#: FavoritePlugin.php:417 +#: FavoriteModule.php:417 msgctxt "COMMANDHELP" msgid "add notice with the given id as a 'fave'" msgstr "" #. TRANS: Menu item in personal group navigation menu. -#: FavoritePlugin.php:469 +#: FavoriteModule.php:469 msgctxt "MENU" msgid "Favorites" msgstr "" #. TRANS: Menu item in search group navigation panel. -#: FavoritePlugin.php:482 +#: FavoriteModule.php:482 msgctxt "MENU" msgid "Popular" msgstr "محبوبة" -#. TRANS: Plugin description. -#: FavoritePlugin.php:508 +#. TRANS: Module description. +#: FavoriteModule.php:508 msgid "Favorites (likes) using ActivityStreams." msgstr "" diff --git a/modules/Favorite/locale/arz/LC_MESSAGES/Favorite.po b/modules/Favorite/locale/arz/LC_MESSAGES/Favorite.po index 4c43437593..b0399fab31 100644 --- a/modules/Favorite/locale/arz/LC_MESSAGES/Favorite.po +++ b/modules/Favorite/locale/arz/LC_MESSAGES/Favorite.po @@ -31,31 +31,31 @@ msgid "Disfavor favorite" msgstr "" #. TRANS: Help message for IM/SMS command "fav ". -#: FavoritePlugin.php:415 +#: FavoriteModule.php:415 msgctxt "COMMANDHELP" msgid "add user's last notice as a 'fave'" msgstr "" #. TRANS: Help message for IM/SMS command "fav #". -#: FavoritePlugin.php:417 +#: FavoriteModule.php:417 msgctxt "COMMANDHELP" msgid "add notice with the given id as a 'fave'" msgstr "" #. TRANS: Menu item in personal group navigation menu. -#: FavoritePlugin.php:469 +#: FavoriteModule.php:469 msgctxt "MENU" msgid "Favorites" msgstr "" #. TRANS: Menu item in search group navigation panel. -#: FavoritePlugin.php:482 +#: FavoriteModule.php:482 msgctxt "MENU" msgid "Popular" msgstr "" -#. TRANS: Plugin description. -#: FavoritePlugin.php:508 +#. TRANS: Module description. +#: FavoriteModule.php:508 msgid "Favorites (likes) using ActivityStreams." msgstr "" diff --git a/modules/Favorite/locale/ast/LC_MESSAGES/Favorite.po b/modules/Favorite/locale/ast/LC_MESSAGES/Favorite.po index 2ddf2b445a..077929d0cf 100644 --- a/modules/Favorite/locale/ast/LC_MESSAGES/Favorite.po +++ b/modules/Favorite/locale/ast/LC_MESSAGES/Favorite.po @@ -31,31 +31,31 @@ msgid "Disfavor favorite" msgstr "" #. TRANS: Help message for IM/SMS command "fav ". -#: FavoritePlugin.php:415 +#: FavoriteModule.php:415 msgctxt "COMMANDHELP" msgid "add user's last notice as a 'fave'" msgstr "" #. TRANS: Help message for IM/SMS command "fav #". -#: FavoritePlugin.php:417 +#: FavoriteModule.php:417 msgctxt "COMMANDHELP" msgid "add notice with the given id as a 'fave'" msgstr "" #. TRANS: Menu item in personal group navigation menu. -#: FavoritePlugin.php:469 +#: FavoriteModule.php:469 msgctxt "MENU" msgid "Favorites" msgstr "" #. TRANS: Menu item in search group navigation panel. -#: FavoritePlugin.php:482 +#: FavoriteModule.php:482 msgctxt "MENU" msgid "Popular" msgstr "" -#. TRANS: Plugin description. -#: FavoritePlugin.php:508 +#. TRANS: Module description. +#: FavoriteModule.php:508 msgid "Favorites (likes) using ActivityStreams." msgstr "" diff --git a/modules/Favorite/locale/be-tarask/LC_MESSAGES/Favorite.po b/modules/Favorite/locale/be-tarask/LC_MESSAGES/Favorite.po index f59b6e7e89..a318549b65 100644 --- a/modules/Favorite/locale/be-tarask/LC_MESSAGES/Favorite.po +++ b/modules/Favorite/locale/be-tarask/LC_MESSAGES/Favorite.po @@ -31,31 +31,31 @@ msgid "Disfavor favorite" msgstr "" #. TRANS: Help message for IM/SMS command "fav ". -#: FavoritePlugin.php:415 +#: FavoriteModule.php:415 msgctxt "COMMANDHELP" msgid "add user's last notice as a 'fave'" msgstr "" #. TRANS: Help message for IM/SMS command "fav #". -#: FavoritePlugin.php:417 +#: FavoriteModule.php:417 msgctxt "COMMANDHELP" msgid "add notice with the given id as a 'fave'" msgstr "" #. TRANS: Menu item in personal group navigation menu. -#: FavoritePlugin.php:469 +#: FavoriteModule.php:469 msgctxt "MENU" msgid "Favorites" msgstr "" #. TRANS: Menu item in search group navigation panel. -#: FavoritePlugin.php:482 +#: FavoriteModule.php:482 msgctxt "MENU" msgid "Popular" msgstr "" -#. TRANS: Plugin description. -#: FavoritePlugin.php:508 +#. TRANS: Module description. +#: FavoriteModule.php:508 msgid "Favorites (likes) using ActivityStreams." msgstr "" diff --git a/modules/Favorite/locale/bg/LC_MESSAGES/Favorite.po b/modules/Favorite/locale/bg/LC_MESSAGES/Favorite.po index c5ee17aa96..3fd34a8853 100644 --- a/modules/Favorite/locale/bg/LC_MESSAGES/Favorite.po +++ b/modules/Favorite/locale/bg/LC_MESSAGES/Favorite.po @@ -31,31 +31,31 @@ msgid "Disfavor favorite" msgstr "" #. TRANS: Help message for IM/SMS command "fav ". -#: FavoritePlugin.php:415 +#: FavoriteModule.php:415 msgctxt "COMMANDHELP" msgid "add user's last notice as a 'fave'" msgstr "" #. TRANS: Help message for IM/SMS command "fav #". -#: FavoritePlugin.php:417 +#: FavoriteModule.php:417 msgctxt "COMMANDHELP" msgid "add notice with the given id as a 'fave'" msgstr "" #. TRANS: Menu item in personal group navigation menu. -#: FavoritePlugin.php:469 +#: FavoriteModule.php:469 msgctxt "MENU" msgid "Favorites" msgstr "" #. TRANS: Menu item in search group navigation panel. -#: FavoritePlugin.php:482 +#: FavoriteModule.php:482 msgctxt "MENU" msgid "Popular" msgstr "" -#. TRANS: Plugin description. -#: FavoritePlugin.php:508 +#. TRANS: Module description. +#: FavoriteModule.php:508 msgid "Favorites (likes) using ActivityStreams." msgstr "" diff --git a/modules/Favorite/locale/bn_IN/LC_MESSAGES/Favorite.po b/modules/Favorite/locale/bn_IN/LC_MESSAGES/Favorite.po index 787cacb01d..82bbd78325 100644 --- a/modules/Favorite/locale/bn_IN/LC_MESSAGES/Favorite.po +++ b/modules/Favorite/locale/bn_IN/LC_MESSAGES/Favorite.po @@ -31,31 +31,31 @@ msgid "Disfavor favorite" msgstr "" #. TRANS: Help message for IM/SMS command "fav ". -#: FavoritePlugin.php:415 +#: FavoriteModule.php:415 msgctxt "COMMANDHELP" msgid "add user's last notice as a 'fave'" msgstr "" #. TRANS: Help message for IM/SMS command "fav #". -#: FavoritePlugin.php:417 +#: FavoriteModule.php:417 msgctxt "COMMANDHELP" msgid "add notice with the given id as a 'fave'" msgstr "" #. TRANS: Menu item in personal group navigation menu. -#: FavoritePlugin.php:469 +#: FavoriteModule.php:469 msgctxt "MENU" msgid "Favorites" msgstr "" #. TRANS: Menu item in search group navigation panel. -#: FavoritePlugin.php:482 +#: FavoriteModule.php:482 msgctxt "MENU" msgid "Popular" msgstr "" -#. TRANS: Plugin description. -#: FavoritePlugin.php:508 +#. TRANS: Module description. +#: FavoriteModule.php:508 msgid "Favorites (likes) using ActivityStreams." msgstr "" diff --git a/modules/Favorite/locale/br/LC_MESSAGES/Favorite.po b/modules/Favorite/locale/br/LC_MESSAGES/Favorite.po index 438e41f6ed..896bad68cf 100644 --- a/modules/Favorite/locale/br/LC_MESSAGES/Favorite.po +++ b/modules/Favorite/locale/br/LC_MESSAGES/Favorite.po @@ -31,31 +31,31 @@ msgid "Disfavor favorite" msgstr "" #. TRANS: Help message for IM/SMS command "fav ". -#: FavoritePlugin.php:415 +#: FavoriteModule.php:415 msgctxt "COMMANDHELP" msgid "add user's last notice as a 'fave'" msgstr "" #. TRANS: Help message for IM/SMS command "fav #". -#: FavoritePlugin.php:417 +#: FavoriteModule.php:417 msgctxt "COMMANDHELP" msgid "add notice with the given id as a 'fave'" msgstr "" #. TRANS: Menu item in personal group navigation menu. -#: FavoritePlugin.php:469 +#: FavoriteModule.php:469 msgctxt "MENU" msgid "Favorites" msgstr "" #. TRANS: Menu item in search group navigation panel. -#: FavoritePlugin.php:482 +#: FavoriteModule.php:482 msgctxt "MENU" msgid "Popular" msgstr "Poblek" -#. TRANS: Plugin description. -#: FavoritePlugin.php:508 +#. TRANS: Module description. +#: FavoriteModule.php:508 msgid "Favorites (likes) using ActivityStreams." msgstr "" diff --git a/modules/Favorite/locale/ca/LC_MESSAGES/Favorite.po b/modules/Favorite/locale/ca/LC_MESSAGES/Favorite.po index 3e18fd1edf..fa0cd22c42 100644 --- a/modules/Favorite/locale/ca/LC_MESSAGES/Favorite.po +++ b/modules/Favorite/locale/ca/LC_MESSAGES/Favorite.po @@ -31,31 +31,31 @@ msgid "Disfavor favorite" msgstr "" #. TRANS: Help message for IM/SMS command "fav ". -#: FavoritePlugin.php:415 +#: FavoriteModule.php:415 msgctxt "COMMANDHELP" msgid "add user's last notice as a 'fave'" msgstr "" #. TRANS: Help message for IM/SMS command "fav #". -#: FavoritePlugin.php:417 +#: FavoriteModule.php:417 msgctxt "COMMANDHELP" msgid "add notice with the given id as a 'fave'" msgstr "" #. TRANS: Menu item in personal group navigation menu. -#: FavoritePlugin.php:469 +#: FavoriteModule.php:469 msgctxt "MENU" msgid "Favorites" msgstr "" #. TRANS: Menu item in search group navigation panel. -#: FavoritePlugin.php:482 +#: FavoriteModule.php:482 msgctxt "MENU" msgid "Popular" msgstr "Populars" -#. TRANS: Plugin description. -#: FavoritePlugin.php:508 +#. TRANS: Module description. +#: FavoriteModule.php:508 msgid "Favorites (likes) using ActivityStreams." msgstr "" diff --git a/modules/Favorite/locale/cs/LC_MESSAGES/Favorite.po b/modules/Favorite/locale/cs/LC_MESSAGES/Favorite.po index 891f8cde68..e3dbe2309e 100644 --- a/modules/Favorite/locale/cs/LC_MESSAGES/Favorite.po +++ b/modules/Favorite/locale/cs/LC_MESSAGES/Favorite.po @@ -32,31 +32,31 @@ msgid "Disfavor favorite" msgstr "Odebrat z oblíbených" #. TRANS: Help message for IM/SMS command "fav ". -#: FavoritePlugin.php:415 +#: FavoriteModule.php:415 msgctxt "COMMANDHELP" msgid "add user's last notice as a 'fave'" msgstr "přidat poslední sdělení uživatele k oblíbeným" #. TRANS: Help message for IM/SMS command "fav #". -#: FavoritePlugin.php:417 +#: FavoriteModule.php:417 msgctxt "COMMANDHELP" msgid "add notice with the given id as a 'fave'" msgstr "přidat sdělení s tímto ID k oblíbeným" #. TRANS: Menu item in personal group navigation menu. -#: FavoritePlugin.php:469 +#: FavoriteModule.php:469 msgctxt "MENU" msgid "Favorites" msgstr "Oblíbené" #. TRANS: Menu item in search group navigation panel. -#: FavoritePlugin.php:482 +#: FavoriteModule.php:482 msgctxt "MENU" msgid "Popular" msgstr "Populární" -#. TRANS: Plugin description. -#: FavoritePlugin.php:508 +#. TRANS: Module description. +#: FavoriteModule.php:508 msgid "Favorites (likes) using ActivityStreams." msgstr "Oblíbené (like) skrze ActivityStreams." diff --git a/modules/Favorite/locale/da/LC_MESSAGES/Favorite.po b/modules/Favorite/locale/da/LC_MESSAGES/Favorite.po index 5895240ed4..87efd506d3 100644 --- a/modules/Favorite/locale/da/LC_MESSAGES/Favorite.po +++ b/modules/Favorite/locale/da/LC_MESSAGES/Favorite.po @@ -31,31 +31,31 @@ msgid "Disfavor favorite" msgstr "" #. TRANS: Help message for IM/SMS command "fav ". -#: FavoritePlugin.php:415 +#: FavoriteModule.php:415 msgctxt "COMMANDHELP" msgid "add user's last notice as a 'fave'" msgstr "" #. TRANS: Help message for IM/SMS command "fav #". -#: FavoritePlugin.php:417 +#: FavoriteModule.php:417 msgctxt "COMMANDHELP" msgid "add notice with the given id as a 'fave'" msgstr "" #. TRANS: Menu item in personal group navigation menu. -#: FavoritePlugin.php:469 +#: FavoriteModule.php:469 msgctxt "MENU" msgid "Favorites" msgstr "" #. TRANS: Menu item in search group navigation panel. -#: FavoritePlugin.php:482 +#: FavoriteModule.php:482 msgctxt "MENU" msgid "Popular" msgstr "" -#. TRANS: Plugin description. -#: FavoritePlugin.php:508 +#. TRANS: Module description. +#: FavoriteModule.php:508 msgid "Favorites (likes) using ActivityStreams." msgstr "" diff --git a/modules/Favorite/locale/de/LC_MESSAGES/Favorite.po b/modules/Favorite/locale/de/LC_MESSAGES/Favorite.po index 620c185f00..e0c18ccb16 100644 --- a/modules/Favorite/locale/de/LC_MESSAGES/Favorite.po +++ b/modules/Favorite/locale/de/LC_MESSAGES/Favorite.po @@ -32,31 +32,31 @@ msgid "Disfavor favorite" msgstr "" #. TRANS: Help message for IM/SMS command "fav ". -#: FavoritePlugin.php:415 +#: FavoriteModule.php:415 msgctxt "COMMANDHELP" msgid "add user's last notice as a 'fave'" msgstr "" #. TRANS: Help message for IM/SMS command "fav #". -#: FavoritePlugin.php:417 +#: FavoriteModule.php:417 msgctxt "COMMANDHELP" msgid "add notice with the given id as a 'fave'" msgstr "" #. TRANS: Menu item in personal group navigation menu. -#: FavoritePlugin.php:469 +#: FavoriteModule.php:469 msgctxt "MENU" msgid "Favorites" msgstr "Favoriten" #. TRANS: Menu item in search group navigation panel. -#: FavoritePlugin.php:482 +#: FavoriteModule.php:482 msgctxt "MENU" msgid "Popular" msgstr "Beliebt" -#. TRANS: Plugin description. -#: FavoritePlugin.php:508 +#. TRANS: Module description. +#: FavoriteModule.php:508 msgid "Favorites (likes) using ActivityStreams." msgstr "" diff --git a/modules/Favorite/locale/el/LC_MESSAGES/Favorite.po b/modules/Favorite/locale/el/LC_MESSAGES/Favorite.po index f112e0535e..852e56c503 100644 --- a/modules/Favorite/locale/el/LC_MESSAGES/Favorite.po +++ b/modules/Favorite/locale/el/LC_MESSAGES/Favorite.po @@ -31,31 +31,31 @@ msgid "Disfavor favorite" msgstr "" #. TRANS: Help message for IM/SMS command "fav ". -#: FavoritePlugin.php:415 +#: FavoriteModule.php:415 msgctxt "COMMANDHELP" msgid "add user's last notice as a 'fave'" msgstr "" #. TRANS: Help message for IM/SMS command "fav #". -#: FavoritePlugin.php:417 +#: FavoriteModule.php:417 msgctxt "COMMANDHELP" msgid "add notice with the given id as a 'fave'" msgstr "" #. TRANS: Menu item in personal group navigation menu. -#: FavoritePlugin.php:469 +#: FavoriteModule.php:469 msgctxt "MENU" msgid "Favorites" msgstr "" #. TRANS: Menu item in search group navigation panel. -#: FavoritePlugin.php:482 +#: FavoriteModule.php:482 msgctxt "MENU" msgid "Popular" msgstr "" -#. TRANS: Plugin description. -#: FavoritePlugin.php:508 +#. TRANS: Module description. +#: FavoriteModule.php:508 msgid "Favorites (likes) using ActivityStreams." msgstr "" diff --git a/modules/Favorite/locale/en_GB/LC_MESSAGES/Favorite.po b/modules/Favorite/locale/en_GB/LC_MESSAGES/Favorite.po index 915503a8e0..78f2c3fa41 100644 --- a/modules/Favorite/locale/en_GB/LC_MESSAGES/Favorite.po +++ b/modules/Favorite/locale/en_GB/LC_MESSAGES/Favorite.po @@ -32,31 +32,31 @@ msgid "Disfavor favorite" msgstr "Disfavour favourite" #. TRANS: Help message for IM/SMS command "fav ". -#: FavoritePlugin.php:415 +#: FavoriteModule.php:415 msgctxt "COMMANDHELP" msgid "add user's last notice as a 'fave'" msgstr "add user's last notice as a 'fave'" #. TRANS: Help message for IM/SMS command "fav #". -#: FavoritePlugin.php:417 +#: FavoriteModule.php:417 msgctxt "COMMANDHELP" msgid "add notice with the given id as a 'fave'" msgstr "add notice with the given id as a 'fave'" #. TRANS: Menu item in personal group navigation menu. -#: FavoritePlugin.php:469 +#: FavoriteModule.php:469 msgctxt "MENU" msgid "Favorites" msgstr "Favourites" #. TRANS: Menu item in search group navigation panel. -#: FavoritePlugin.php:482 +#: FavoriteModule.php:482 msgctxt "MENU" msgid "Popular" msgstr "Popular" -#. TRANS: Plugin description. -#: FavoritePlugin.php:508 +#. TRANS: Module description. +#: FavoriteModule.php:508 msgid "Favorites (likes) using ActivityStreams." msgstr "Favourites (likes) using ActivityStreams." diff --git a/modules/Favorite/locale/eo/LC_MESSAGES/Favorite.po b/modules/Favorite/locale/eo/LC_MESSAGES/Favorite.po index 174924b672..add69dc3e7 100644 --- a/modules/Favorite/locale/eo/LC_MESSAGES/Favorite.po +++ b/modules/Favorite/locale/eo/LC_MESSAGES/Favorite.po @@ -31,31 +31,31 @@ msgid "Disfavor favorite" msgstr "" #. TRANS: Help message for IM/SMS command "fav ". -#: FavoritePlugin.php:415 +#: FavoriteModule.php:415 msgctxt "COMMANDHELP" msgid "add user's last notice as a 'fave'" msgstr "" #. TRANS: Help message for IM/SMS command "fav #". -#: FavoritePlugin.php:417 +#: FavoriteModule.php:417 msgctxt "COMMANDHELP" msgid "add notice with the given id as a 'fave'" msgstr "" #. TRANS: Menu item in personal group navigation menu. -#: FavoritePlugin.php:469 +#: FavoriteModule.php:469 msgctxt "MENU" msgid "Favorites" msgstr "" #. TRANS: Menu item in search group navigation panel. -#: FavoritePlugin.php:482 +#: FavoriteModule.php:482 msgctxt "MENU" msgid "Popular" msgstr "" -#. TRANS: Plugin description. -#: FavoritePlugin.php:508 +#. TRANS: Module description. +#: FavoriteModule.php:508 msgid "Favorites (likes) using ActivityStreams." msgstr "" diff --git a/modules/Favorite/locale/es/LC_MESSAGES/Favorite.po b/modules/Favorite/locale/es/LC_MESSAGES/Favorite.po index d65fc904e6..df621bfc18 100644 --- a/modules/Favorite/locale/es/LC_MESSAGES/Favorite.po +++ b/modules/Favorite/locale/es/LC_MESSAGES/Favorite.po @@ -32,31 +32,31 @@ msgid "Disfavor favorite" msgstr "Desmarcar favorito" #. TRANS: Help message for IM/SMS command "fav ". -#: FavoritePlugin.php:415 +#: FavoriteModule.php:415 msgctxt "COMMANDHELP" msgid "add user's last notice as a 'fave'" msgstr "marcar como favorito el último mensaje del usuario" #. TRANS: Help message for IM/SMS command "fav #". -#: FavoritePlugin.php:417 +#: FavoriteModule.php:417 msgctxt "COMMANDHELP" msgid "add notice with the given id as a 'fave'" msgstr "marcar como favorito el mensaje con el identificador dado" #. TRANS: Menu item in personal group navigation menu. -#: FavoritePlugin.php:469 +#: FavoriteModule.php:469 msgctxt "MENU" msgid "Favorites" msgstr "Favoritos" #. TRANS: Menu item in search group navigation panel. -#: FavoritePlugin.php:482 +#: FavoriteModule.php:482 msgctxt "MENU" msgid "Popular" msgstr "Popular" -#. TRANS: Plugin description. -#: FavoritePlugin.php:508 +#. TRANS: Module description. +#: FavoriteModule.php:508 msgid "Favorites (likes) using ActivityStreams." msgstr "Favoritos (me gusta) usando Activity Streams." diff --git a/modules/Favorite/locale/eu/LC_MESSAGES/Favorite.po b/modules/Favorite/locale/eu/LC_MESSAGES/Favorite.po index 8e6ce25b5b..61f125f998 100644 --- a/modules/Favorite/locale/eu/LC_MESSAGES/Favorite.po +++ b/modules/Favorite/locale/eu/LC_MESSAGES/Favorite.po @@ -31,31 +31,31 @@ msgid "Disfavor favorite" msgstr "" #. TRANS: Help message for IM/SMS command "fav ". -#: FavoritePlugin.php:415 +#: FavoriteModule.php:415 msgctxt "COMMANDHELP" msgid "add user's last notice as a 'fave'" msgstr "" #. TRANS: Help message for IM/SMS command "fav #". -#: FavoritePlugin.php:417 +#: FavoriteModule.php:417 msgctxt "COMMANDHELP" msgid "add notice with the given id as a 'fave'" msgstr "" #. TRANS: Menu item in personal group navigation menu. -#: FavoritePlugin.php:469 +#: FavoriteModule.php:469 msgctxt "MENU" msgid "Favorites" msgstr "" #. TRANS: Menu item in search group navigation panel. -#: FavoritePlugin.php:482 +#: FavoriteModule.php:482 msgctxt "MENU" msgid "Popular" msgstr "Arrakastatsua" -#. TRANS: Plugin description. -#: FavoritePlugin.php:508 +#. TRANS: Module description. +#: FavoriteModule.php:508 msgid "Favorites (likes) using ActivityStreams." msgstr "" diff --git a/modules/Favorite/locale/fa/LC_MESSAGES/Favorite.po b/modules/Favorite/locale/fa/LC_MESSAGES/Favorite.po index a249b9d733..271e9d2035 100644 --- a/modules/Favorite/locale/fa/LC_MESSAGES/Favorite.po +++ b/modules/Favorite/locale/fa/LC_MESSAGES/Favorite.po @@ -31,31 +31,31 @@ msgid "Disfavor favorite" msgstr "" #. TRANS: Help message for IM/SMS command "fav ". -#: FavoritePlugin.php:415 +#: FavoriteModule.php:415 msgctxt "COMMANDHELP" msgid "add user's last notice as a 'fave'" msgstr "" #. TRANS: Help message for IM/SMS command "fav #". -#: FavoritePlugin.php:417 +#: FavoriteModule.php:417 msgctxt "COMMANDHELP" msgid "add notice with the given id as a 'fave'" msgstr "" #. TRANS: Menu item in personal group navigation menu. -#: FavoritePlugin.php:469 +#: FavoriteModule.php:469 msgctxt "MENU" msgid "Favorites" msgstr "" #. TRANS: Menu item in search group navigation panel. -#: FavoritePlugin.php:482 +#: FavoriteModule.php:482 msgctxt "MENU" msgid "Popular" msgstr "" -#. TRANS: Plugin description. -#: FavoritePlugin.php:508 +#. TRANS: Module description. +#: FavoriteModule.php:508 msgid "Favorites (likes) using ActivityStreams." msgstr "" diff --git a/modules/Favorite/locale/fi/LC_MESSAGES/Favorite.po b/modules/Favorite/locale/fi/LC_MESSAGES/Favorite.po index acb8564a78..ade96cfcf1 100644 --- a/modules/Favorite/locale/fi/LC_MESSAGES/Favorite.po +++ b/modules/Favorite/locale/fi/LC_MESSAGES/Favorite.po @@ -31,31 +31,31 @@ msgid "Disfavor favorite" msgstr "" #. TRANS: Help message for IM/SMS command "fav ". -#: FavoritePlugin.php:415 +#: FavoriteModule.php:415 msgctxt "COMMANDHELP" msgid "add user's last notice as a 'fave'" msgstr "" #. TRANS: Help message for IM/SMS command "fav #". -#: FavoritePlugin.php:417 +#: FavoriteModule.php:417 msgctxt "COMMANDHELP" msgid "add notice with the given id as a 'fave'" msgstr "" #. TRANS: Menu item in personal group navigation menu. -#: FavoritePlugin.php:469 +#: FavoriteModule.php:469 msgctxt "MENU" msgid "Favorites" msgstr "" #. TRANS: Menu item in search group navigation panel. -#: FavoritePlugin.php:482 +#: FavoriteModule.php:482 msgctxt "MENU" msgid "Popular" msgstr "" -#. TRANS: Plugin description. -#: FavoritePlugin.php:508 +#. TRANS: Module description. +#: FavoriteModule.php:508 msgid "Favorites (likes) using ActivityStreams." msgstr "" diff --git a/modules/Favorite/locale/fr/LC_MESSAGES/Favorite.po b/modules/Favorite/locale/fr/LC_MESSAGES/Favorite.po index 93543d792d..ea3aa04e9c 100644 --- a/modules/Favorite/locale/fr/LC_MESSAGES/Favorite.po +++ b/modules/Favorite/locale/fr/LC_MESSAGES/Favorite.po @@ -32,31 +32,31 @@ msgid "Disfavor favorite" msgstr "Enlever des favoris" #. TRANS: Help message for IM/SMS command "fav ". -#: FavoritePlugin.php:415 +#: FavoriteModule.php:415 msgctxt "COMMANDHELP" msgid "add user's last notice as a 'fave'" msgstr "Ajouter la dernière notice de l'utilisateur comme favori" #. TRANS: Help message for IM/SMS command "fav #". -#: FavoritePlugin.php:417 +#: FavoriteModule.php:417 msgctxt "COMMANDHELP" msgid "add notice with the given id as a 'fave'" msgstr "" #. TRANS: Menu item in personal group navigation menu. -#: FavoritePlugin.php:469 +#: FavoriteModule.php:469 msgctxt "MENU" msgid "Favorites" msgstr "favoris" #. TRANS: Menu item in search group navigation panel. -#: FavoritePlugin.php:482 +#: FavoriteModule.php:482 msgctxt "MENU" msgid "Popular" msgstr "Populaires" -#. TRANS: Plugin description. -#: FavoritePlugin.php:508 +#. TRANS: Module description. +#: FavoriteModule.php:508 msgid "Favorites (likes) using ActivityStreams." msgstr "favoris (like) en utilisant le flux d'activités" diff --git a/modules/Favorite/locale/fur/LC_MESSAGES/Favorite.po b/modules/Favorite/locale/fur/LC_MESSAGES/Favorite.po index a009808d42..9c90492b21 100644 --- a/modules/Favorite/locale/fur/LC_MESSAGES/Favorite.po +++ b/modules/Favorite/locale/fur/LC_MESSAGES/Favorite.po @@ -31,31 +31,31 @@ msgid "Disfavor favorite" msgstr "" #. TRANS: Help message for IM/SMS command "fav ". -#: FavoritePlugin.php:415 +#: FavoriteModule.php:415 msgctxt "COMMANDHELP" msgid "add user's last notice as a 'fave'" msgstr "" #. TRANS: Help message for IM/SMS command "fav #". -#: FavoritePlugin.php:417 +#: FavoriteModule.php:417 msgctxt "COMMANDHELP" msgid "add notice with the given id as a 'fave'" msgstr "" #. TRANS: Menu item in personal group navigation menu. -#: FavoritePlugin.php:469 +#: FavoriteModule.php:469 msgctxt "MENU" msgid "Favorites" msgstr "" #. TRANS: Menu item in search group navigation panel. -#: FavoritePlugin.php:482 +#: FavoriteModule.php:482 msgctxt "MENU" msgid "Popular" msgstr "Popolar" -#. TRANS: Plugin description. -#: FavoritePlugin.php:508 +#. TRANS: Module description. +#: FavoriteModule.php:508 msgid "Favorites (likes) using ActivityStreams." msgstr "" diff --git a/modules/Favorite/locale/gl/LC_MESSAGES/Favorite.po b/modules/Favorite/locale/gl/LC_MESSAGES/Favorite.po index 4cc8c7ccfc..01a49b127b 100644 --- a/modules/Favorite/locale/gl/LC_MESSAGES/Favorite.po +++ b/modules/Favorite/locale/gl/LC_MESSAGES/Favorite.po @@ -31,31 +31,31 @@ msgid "Disfavor favorite" msgstr "" #. TRANS: Help message for IM/SMS command "fav ". -#: FavoritePlugin.php:415 +#: FavoriteModule.php:415 msgctxt "COMMANDHELP" msgid "add user's last notice as a 'fave'" msgstr "" #. TRANS: Help message for IM/SMS command "fav #". -#: FavoritePlugin.php:417 +#: FavoriteModule.php:417 msgctxt "COMMANDHELP" msgid "add notice with the given id as a 'fave'" msgstr "" #. TRANS: Menu item in personal group navigation menu. -#: FavoritePlugin.php:469 +#: FavoriteModule.php:469 msgctxt "MENU" msgid "Favorites" msgstr "" #. TRANS: Menu item in search group navigation panel. -#: FavoritePlugin.php:482 +#: FavoriteModule.php:482 msgctxt "MENU" msgid "Popular" msgstr "Populares" -#. TRANS: Plugin description. -#: FavoritePlugin.php:508 +#. TRANS: Module description. +#: FavoriteModule.php:508 msgid "Favorites (likes) using ActivityStreams." msgstr "" diff --git a/modules/Favorite/locale/he/LC_MESSAGES/Favorite.po b/modules/Favorite/locale/he/LC_MESSAGES/Favorite.po index 0ccdfbbc75..4b2609a31e 100644 --- a/modules/Favorite/locale/he/LC_MESSAGES/Favorite.po +++ b/modules/Favorite/locale/he/LC_MESSAGES/Favorite.po @@ -31,31 +31,31 @@ msgid "Disfavor favorite" msgstr "" #. TRANS: Help message for IM/SMS command "fav ". -#: FavoritePlugin.php:415 +#: FavoriteModule.php:415 msgctxt "COMMANDHELP" msgid "add user's last notice as a 'fave'" msgstr "" #. TRANS: Help message for IM/SMS command "fav #". -#: FavoritePlugin.php:417 +#: FavoriteModule.php:417 msgctxt "COMMANDHELP" msgid "add notice with the given id as a 'fave'" msgstr "" #. TRANS: Menu item in personal group navigation menu. -#: FavoritePlugin.php:469 +#: FavoriteModule.php:469 msgctxt "MENU" msgid "Favorites" msgstr "" #. TRANS: Menu item in search group navigation panel. -#: FavoritePlugin.php:482 +#: FavoriteModule.php:482 msgctxt "MENU" msgid "Popular" msgstr "" -#. TRANS: Plugin description. -#: FavoritePlugin.php:508 +#. TRANS: Module description. +#: FavoriteModule.php:508 msgid "Favorites (likes) using ActivityStreams." msgstr "" diff --git a/modules/Favorite/locale/hsb/LC_MESSAGES/Favorite.po b/modules/Favorite/locale/hsb/LC_MESSAGES/Favorite.po index f4b818e685..10d4aa0025 100644 --- a/modules/Favorite/locale/hsb/LC_MESSAGES/Favorite.po +++ b/modules/Favorite/locale/hsb/LC_MESSAGES/Favorite.po @@ -31,31 +31,31 @@ msgid "Disfavor favorite" msgstr "" #. TRANS: Help message for IM/SMS command "fav ". -#: FavoritePlugin.php:415 +#: FavoriteModule.php:415 msgctxt "COMMANDHELP" msgid "add user's last notice as a 'fave'" msgstr "" #. TRANS: Help message for IM/SMS command "fav #". -#: FavoritePlugin.php:417 +#: FavoriteModule.php:417 msgctxt "COMMANDHELP" msgid "add notice with the given id as a 'fave'" msgstr "" #. TRANS: Menu item in personal group navigation menu. -#: FavoritePlugin.php:469 +#: FavoriteModule.php:469 msgctxt "MENU" msgid "Favorites" msgstr "" #. TRANS: Menu item in search group navigation panel. -#: FavoritePlugin.php:482 +#: FavoriteModule.php:482 msgctxt "MENU" msgid "Popular" msgstr "" -#. TRANS: Plugin description. -#: FavoritePlugin.php:508 +#. TRANS: Module description. +#: FavoriteModule.php:508 msgid "Favorites (likes) using ActivityStreams." msgstr "" diff --git a/modules/Favorite/locale/hu/LC_MESSAGES/Favorite.po b/modules/Favorite/locale/hu/LC_MESSAGES/Favorite.po index 1e3e227428..2245d9ce5d 100644 --- a/modules/Favorite/locale/hu/LC_MESSAGES/Favorite.po +++ b/modules/Favorite/locale/hu/LC_MESSAGES/Favorite.po @@ -31,31 +31,31 @@ msgid "Disfavor favorite" msgstr "" #. TRANS: Help message for IM/SMS command "fav ". -#: FavoritePlugin.php:415 +#: FavoriteModule.php:415 msgctxt "COMMANDHELP" msgid "add user's last notice as a 'fave'" msgstr "" #. TRANS: Help message for IM/SMS command "fav #". -#: FavoritePlugin.php:417 +#: FavoriteModule.php:417 msgctxt "COMMANDHELP" msgid "add notice with the given id as a 'fave'" msgstr "" #. TRANS: Menu item in personal group navigation menu. -#: FavoritePlugin.php:469 +#: FavoriteModule.php:469 msgctxt "MENU" msgid "Favorites" msgstr "" #. TRANS: Menu item in search group navigation panel. -#: FavoritePlugin.php:482 +#: FavoriteModule.php:482 msgctxt "MENU" msgid "Popular" msgstr "" -#. TRANS: Plugin description. -#: FavoritePlugin.php:508 +#. TRANS: Module description. +#: FavoriteModule.php:508 msgid "Favorites (likes) using ActivityStreams." msgstr "" diff --git a/modules/Favorite/locale/hy_AM/LC_MESSAGES/Favorite.po b/modules/Favorite/locale/hy_AM/LC_MESSAGES/Favorite.po index 5c9e7103d7..81a4e99d6a 100644 --- a/modules/Favorite/locale/hy_AM/LC_MESSAGES/Favorite.po +++ b/modules/Favorite/locale/hy_AM/LC_MESSAGES/Favorite.po @@ -31,31 +31,31 @@ msgid "Disfavor favorite" msgstr "" #. TRANS: Help message for IM/SMS command "fav ". -#: FavoritePlugin.php:415 +#: FavoriteModule.php:415 msgctxt "COMMANDHELP" msgid "add user's last notice as a 'fave'" msgstr "" #. TRANS: Help message for IM/SMS command "fav #". -#: FavoritePlugin.php:417 +#: FavoriteModule.php:417 msgctxt "COMMANDHELP" msgid "add notice with the given id as a 'fave'" msgstr "" #. TRANS: Menu item in personal group navigation menu. -#: FavoritePlugin.php:469 +#: FavoriteModule.php:469 msgctxt "MENU" msgid "Favorites" msgstr "" #. TRANS: Menu item in search group navigation panel. -#: FavoritePlugin.php:482 +#: FavoriteModule.php:482 msgctxt "MENU" msgid "Popular" msgstr "" -#. TRANS: Plugin description. -#: FavoritePlugin.php:508 +#. TRANS: Module description. +#: FavoriteModule.php:508 msgid "Favorites (likes) using ActivityStreams." msgstr "" diff --git a/modules/Favorite/locale/ia/LC_MESSAGES/Favorite.po b/modules/Favorite/locale/ia/LC_MESSAGES/Favorite.po index 13838ebae7..dbf358da44 100644 --- a/modules/Favorite/locale/ia/LC_MESSAGES/Favorite.po +++ b/modules/Favorite/locale/ia/LC_MESSAGES/Favorite.po @@ -31,31 +31,31 @@ msgid "Disfavor favorite" msgstr "" #. TRANS: Help message for IM/SMS command "fav ". -#: FavoritePlugin.php:415 +#: FavoriteModule.php:415 msgctxt "COMMANDHELP" msgid "add user's last notice as a 'fave'" msgstr "" #. TRANS: Help message for IM/SMS command "fav #". -#: FavoritePlugin.php:417 +#: FavoriteModule.php:417 msgctxt "COMMANDHELP" msgid "add notice with the given id as a 'fave'" msgstr "" #. TRANS: Menu item in personal group navigation menu. -#: FavoritePlugin.php:469 +#: FavoriteModule.php:469 msgctxt "MENU" msgid "Favorites" msgstr "" #. TRANS: Menu item in search group navigation panel. -#: FavoritePlugin.php:482 +#: FavoriteModule.php:482 msgctxt "MENU" msgid "Popular" msgstr "Popular" -#. TRANS: Plugin description. -#: FavoritePlugin.php:508 +#. TRANS: Module description. +#: FavoriteModule.php:508 msgid "Favorites (likes) using ActivityStreams." msgstr "" diff --git a/modules/Favorite/locale/id/LC_MESSAGES/Favorite.po b/modules/Favorite/locale/id/LC_MESSAGES/Favorite.po index 19efc59fef..a8d471eac8 100644 --- a/modules/Favorite/locale/id/LC_MESSAGES/Favorite.po +++ b/modules/Favorite/locale/id/LC_MESSAGES/Favorite.po @@ -31,31 +31,31 @@ msgid "Disfavor favorite" msgstr "" #. TRANS: Help message for IM/SMS command "fav ". -#: FavoritePlugin.php:415 +#: FavoriteModule.php:415 msgctxt "COMMANDHELP" msgid "add user's last notice as a 'fave'" msgstr "" #. TRANS: Help message for IM/SMS command "fav #". -#: FavoritePlugin.php:417 +#: FavoriteModule.php:417 msgctxt "COMMANDHELP" msgid "add notice with the given id as a 'fave'" msgstr "" #. TRANS: Menu item in personal group navigation menu. -#: FavoritePlugin.php:469 +#: FavoriteModule.php:469 msgctxt "MENU" msgid "Favorites" msgstr "" #. TRANS: Menu item in search group navigation panel. -#: FavoritePlugin.php:482 +#: FavoriteModule.php:482 msgctxt "MENU" msgid "Popular" msgstr "Populer" -#. TRANS: Plugin description. -#: FavoritePlugin.php:508 +#. TRANS: Module description. +#: FavoriteModule.php:508 msgid "Favorites (likes) using ActivityStreams." msgstr "" diff --git a/modules/Favorite/locale/io/LC_MESSAGES/Favorite.po b/modules/Favorite/locale/io/LC_MESSAGES/Favorite.po index dcbb586879..ee891669d9 100644 --- a/modules/Favorite/locale/io/LC_MESSAGES/Favorite.po +++ b/modules/Favorite/locale/io/LC_MESSAGES/Favorite.po @@ -32,31 +32,31 @@ msgid "Disfavor favorite" msgstr "Desfavorar la favorito" #. TRANS: Help message for IM/SMS command "fav ". -#: FavoritePlugin.php:415 +#: FavoriteModule.php:415 msgctxt "COMMANDHELP" msgid "add user's last notice as a 'fave'" msgstr "Adjuntar la lasta avizo dil uzanto kom favorato" #. TRANS: Help message for IM/SMS command "fav #". -#: FavoritePlugin.php:417 +#: FavoriteModule.php:417 msgctxt "COMMANDHELP" msgid "add notice with the given id as a 'fave'" msgstr "Adjuntar l'avizo kun l'identifikilo provizata kom favorato" #. TRANS: Menu item in personal group navigation menu. -#: FavoritePlugin.php:469 +#: FavoriteModule.php:469 msgctxt "MENU" msgid "Favorites" msgstr "Favorati" #. TRANS: Menu item in search group navigation panel. -#: FavoritePlugin.php:482 +#: FavoriteModule.php:482 msgctxt "MENU" msgid "Popular" msgstr "Populara" -#. TRANS: Plugin description. -#: FavoritePlugin.php:508 +#. TRANS: Module description. +#: FavoriteModule.php:508 msgid "Favorites (likes) using ActivityStreams." msgstr "Favorati (\"likes\") per ActivityStreams." diff --git a/modules/Favorite/locale/is/LC_MESSAGES/Favorite.po b/modules/Favorite/locale/is/LC_MESSAGES/Favorite.po index c0a703b414..a39fc96450 100644 --- a/modules/Favorite/locale/is/LC_MESSAGES/Favorite.po +++ b/modules/Favorite/locale/is/LC_MESSAGES/Favorite.po @@ -31,31 +31,31 @@ msgid "Disfavor favorite" msgstr "" #. TRANS: Help message for IM/SMS command "fav ". -#: FavoritePlugin.php:415 +#: FavoriteModule.php:415 msgctxt "COMMANDHELP" msgid "add user's last notice as a 'fave'" msgstr "" #. TRANS: Help message for IM/SMS command "fav #". -#: FavoritePlugin.php:417 +#: FavoriteModule.php:417 msgctxt "COMMANDHELP" msgid "add notice with the given id as a 'fave'" msgstr "" #. TRANS: Menu item in personal group navigation menu. -#: FavoritePlugin.php:469 +#: FavoriteModule.php:469 msgctxt "MENU" msgid "Favorites" msgstr "" #. TRANS: Menu item in search group navigation panel. -#: FavoritePlugin.php:482 +#: FavoriteModule.php:482 msgctxt "MENU" msgid "Popular" msgstr "" -#. TRANS: Plugin description. -#: FavoritePlugin.php:508 +#. TRANS: Module description. +#: FavoriteModule.php:508 msgid "Favorites (likes) using ActivityStreams." msgstr "" diff --git a/modules/Favorite/locale/it/LC_MESSAGES/Favorite.po b/modules/Favorite/locale/it/LC_MESSAGES/Favorite.po index bf330080bb..8167f14136 100644 --- a/modules/Favorite/locale/it/LC_MESSAGES/Favorite.po +++ b/modules/Favorite/locale/it/LC_MESSAGES/Favorite.po @@ -32,31 +32,31 @@ msgid "Disfavor favorite" msgstr "" #. TRANS: Help message for IM/SMS command "fav ". -#: FavoritePlugin.php:415 +#: FavoriteModule.php:415 msgctxt "COMMANDHELP" msgid "add user's last notice as a 'fave'" msgstr "" #. TRANS: Help message for IM/SMS command "fav #". -#: FavoritePlugin.php:417 +#: FavoriteModule.php:417 msgctxt "COMMANDHELP" msgid "add notice with the given id as a 'fave'" msgstr "" #. TRANS: Menu item in personal group navigation menu. -#: FavoritePlugin.php:469 +#: FavoriteModule.php:469 msgctxt "MENU" msgid "Favorites" msgstr "Preferiti" #. TRANS: Menu item in search group navigation panel. -#: FavoritePlugin.php:482 +#: FavoriteModule.php:482 msgctxt "MENU" msgid "Popular" msgstr "Popolare" -#. TRANS: Plugin description. -#: FavoritePlugin.php:508 +#. TRANS: Module description. +#: FavoriteModule.php:508 msgid "Favorites (likes) using ActivityStreams." msgstr "" diff --git a/modules/Favorite/locale/ja/LC_MESSAGES/Favorite.po b/modules/Favorite/locale/ja/LC_MESSAGES/Favorite.po index 1ef2f39cc9..c5b3a1fdb8 100644 --- a/modules/Favorite/locale/ja/LC_MESSAGES/Favorite.po +++ b/modules/Favorite/locale/ja/LC_MESSAGES/Favorite.po @@ -31,31 +31,31 @@ msgid "Disfavor favorite" msgstr "" #. TRANS: Help message for IM/SMS command "fav ". -#: FavoritePlugin.php:415 +#: FavoriteModule.php:415 msgctxt "COMMANDHELP" msgid "add user's last notice as a 'fave'" msgstr "" #. TRANS: Help message for IM/SMS command "fav #". -#: FavoritePlugin.php:417 +#: FavoriteModule.php:417 msgctxt "COMMANDHELP" msgid "add notice with the given id as a 'fave'" msgstr "" #. TRANS: Menu item in personal group navigation menu. -#: FavoritePlugin.php:469 +#: FavoriteModule.php:469 msgctxt "MENU" msgid "Favorites" msgstr "" #. TRANS: Menu item in search group navigation panel. -#: FavoritePlugin.php:482 +#: FavoriteModule.php:482 msgctxt "MENU" msgid "Popular" msgstr "" -#. TRANS: Plugin description. -#: FavoritePlugin.php:508 +#. TRANS: Module description. +#: FavoriteModule.php:508 msgid "Favorites (likes) using ActivityStreams." msgstr "" diff --git a/modules/Favorite/locale/ka/LC_MESSAGES/Favorite.po b/modules/Favorite/locale/ka/LC_MESSAGES/Favorite.po index df76d5eea5..9ff4e9f9df 100644 --- a/modules/Favorite/locale/ka/LC_MESSAGES/Favorite.po +++ b/modules/Favorite/locale/ka/LC_MESSAGES/Favorite.po @@ -31,31 +31,31 @@ msgid "Disfavor favorite" msgstr "" #. TRANS: Help message for IM/SMS command "fav ". -#: FavoritePlugin.php:415 +#: FavoriteModule.php:415 msgctxt "COMMANDHELP" msgid "add user's last notice as a 'fave'" msgstr "" #. TRANS: Help message for IM/SMS command "fav #". -#: FavoritePlugin.php:417 +#: FavoriteModule.php:417 msgctxt "COMMANDHELP" msgid "add notice with the given id as a 'fave'" msgstr "" #. TRANS: Menu item in personal group navigation menu. -#: FavoritePlugin.php:469 +#: FavoriteModule.php:469 msgctxt "MENU" msgid "Favorites" msgstr "" #. TRANS: Menu item in search group navigation panel. -#: FavoritePlugin.php:482 +#: FavoriteModule.php:482 msgctxt "MENU" msgid "Popular" msgstr "" -#. TRANS: Plugin description. -#: FavoritePlugin.php:508 +#. TRANS: Module description. +#: FavoriteModule.php:508 msgid "Favorites (likes) using ActivityStreams." msgstr "" diff --git a/modules/Favorite/locale/ko/LC_MESSAGES/Favorite.po b/modules/Favorite/locale/ko/LC_MESSAGES/Favorite.po index 220455f92d..8e7ba79d27 100644 --- a/modules/Favorite/locale/ko/LC_MESSAGES/Favorite.po +++ b/modules/Favorite/locale/ko/LC_MESSAGES/Favorite.po @@ -31,31 +31,31 @@ msgid "Disfavor favorite" msgstr "" #. TRANS: Help message for IM/SMS command "fav ". -#: FavoritePlugin.php:415 +#: FavoriteModule.php:415 msgctxt "COMMANDHELP" msgid "add user's last notice as a 'fave'" msgstr "" #. TRANS: Help message for IM/SMS command "fav #". -#: FavoritePlugin.php:417 +#: FavoriteModule.php:417 msgctxt "COMMANDHELP" msgid "add notice with the given id as a 'fave'" msgstr "" #. TRANS: Menu item in personal group navigation menu. -#: FavoritePlugin.php:469 +#: FavoriteModule.php:469 msgctxt "MENU" msgid "Favorites" msgstr "" #. TRANS: Menu item in search group navigation panel. -#: FavoritePlugin.php:482 +#: FavoriteModule.php:482 msgctxt "MENU" msgid "Popular" msgstr "" -#. TRANS: Plugin description. -#: FavoritePlugin.php:508 +#. TRANS: Module description. +#: FavoriteModule.php:508 msgid "Favorites (likes) using ActivityStreams." msgstr "" diff --git a/modules/Favorite/locale/ksh/LC_MESSAGES/Favorite.po b/modules/Favorite/locale/ksh/LC_MESSAGES/Favorite.po index de9d343877..32690fa895 100644 --- a/modules/Favorite/locale/ksh/LC_MESSAGES/Favorite.po +++ b/modules/Favorite/locale/ksh/LC_MESSAGES/Favorite.po @@ -31,31 +31,31 @@ msgid "Disfavor favorite" msgstr "" #. TRANS: Help message for IM/SMS command "fav ". -#: FavoritePlugin.php:415 +#: FavoriteModule.php:415 msgctxt "COMMANDHELP" msgid "add user's last notice as a 'fave'" msgstr "" #. TRANS: Help message for IM/SMS command "fav #". -#: FavoritePlugin.php:417 +#: FavoriteModule.php:417 msgctxt "COMMANDHELP" msgid "add notice with the given id as a 'fave'" msgstr "" #. TRANS: Menu item in personal group navigation menu. -#: FavoritePlugin.php:469 +#: FavoriteModule.php:469 msgctxt "MENU" msgid "Favorites" msgstr "" #. TRANS: Menu item in search group navigation panel. -#: FavoritePlugin.php:482 +#: FavoriteModule.php:482 msgctxt "MENU" msgid "Popular" msgstr "" -#. TRANS: Plugin description. -#: FavoritePlugin.php:508 +#. TRANS: Module description. +#: FavoriteModule.php:508 msgid "Favorites (likes) using ActivityStreams." msgstr "" diff --git a/modules/Favorite/locale/lb/LC_MESSAGES/Favorite.po b/modules/Favorite/locale/lb/LC_MESSAGES/Favorite.po index d73929dc4d..93a475c9c9 100644 --- a/modules/Favorite/locale/lb/LC_MESSAGES/Favorite.po +++ b/modules/Favorite/locale/lb/LC_MESSAGES/Favorite.po @@ -31,31 +31,31 @@ msgid "Disfavor favorite" msgstr "" #. TRANS: Help message for IM/SMS command "fav ". -#: FavoritePlugin.php:415 +#: FavoriteModule.php:415 msgctxt "COMMANDHELP" msgid "add user's last notice as a 'fave'" msgstr "" #. TRANS: Help message for IM/SMS command "fav #". -#: FavoritePlugin.php:417 +#: FavoriteModule.php:417 msgctxt "COMMANDHELP" msgid "add notice with the given id as a 'fave'" msgstr "" #. TRANS: Menu item in personal group navigation menu. -#: FavoritePlugin.php:469 +#: FavoriteModule.php:469 msgctxt "MENU" msgid "Favorites" msgstr "" #. TRANS: Menu item in search group navigation panel. -#: FavoritePlugin.php:482 +#: FavoriteModule.php:482 msgctxt "MENU" msgid "Popular" msgstr "" -#. TRANS: Plugin description. -#: FavoritePlugin.php:508 +#. TRANS: Module description. +#: FavoriteModule.php:508 msgid "Favorites (likes) using ActivityStreams." msgstr "" diff --git a/modules/Favorite/locale/lt/LC_MESSAGES/Favorite.po b/modules/Favorite/locale/lt/LC_MESSAGES/Favorite.po index b1ba026909..fa7319cbb2 100644 --- a/modules/Favorite/locale/lt/LC_MESSAGES/Favorite.po +++ b/modules/Favorite/locale/lt/LC_MESSAGES/Favorite.po @@ -31,31 +31,31 @@ msgid "Disfavor favorite" msgstr "" #. TRANS: Help message for IM/SMS command "fav ". -#: FavoritePlugin.php:415 +#: FavoriteModule.php:415 msgctxt "COMMANDHELP" msgid "add user's last notice as a 'fave'" msgstr "" #. TRANS: Help message for IM/SMS command "fav #". -#: FavoritePlugin.php:417 +#: FavoriteModule.php:417 msgctxt "COMMANDHELP" msgid "add notice with the given id as a 'fave'" msgstr "" #. TRANS: Menu item in personal group navigation menu. -#: FavoritePlugin.php:469 +#: FavoriteModule.php:469 msgctxt "MENU" msgid "Favorites" msgstr "" #. TRANS: Menu item in search group navigation panel. -#: FavoritePlugin.php:482 +#: FavoriteModule.php:482 msgctxt "MENU" msgid "Popular" msgstr "" -#. TRANS: Plugin description. -#: FavoritePlugin.php:508 +#. TRANS: Module description. +#: FavoriteModule.php:508 msgid "Favorites (likes) using ActivityStreams." msgstr "" diff --git a/modules/Favorite/locale/lv/LC_MESSAGES/Favorite.po b/modules/Favorite/locale/lv/LC_MESSAGES/Favorite.po index 7418988ef7..b0690d339e 100644 --- a/modules/Favorite/locale/lv/LC_MESSAGES/Favorite.po +++ b/modules/Favorite/locale/lv/LC_MESSAGES/Favorite.po @@ -31,31 +31,31 @@ msgid "Disfavor favorite" msgstr "" #. TRANS: Help message for IM/SMS command "fav ". -#: FavoritePlugin.php:415 +#: FavoriteModule.php:415 msgctxt "COMMANDHELP" msgid "add user's last notice as a 'fave'" msgstr "" #. TRANS: Help message for IM/SMS command "fav #". -#: FavoritePlugin.php:417 +#: FavoriteModule.php:417 msgctxt "COMMANDHELP" msgid "add notice with the given id as a 'fave'" msgstr "" #. TRANS: Menu item in personal group navigation menu. -#: FavoritePlugin.php:469 +#: FavoriteModule.php:469 msgctxt "MENU" msgid "Favorites" msgstr "" #. TRANS: Menu item in search group navigation panel. -#: FavoritePlugin.php:482 +#: FavoriteModule.php:482 msgctxt "MENU" msgid "Popular" msgstr "" -#. TRANS: Plugin description. -#: FavoritePlugin.php:508 +#. TRANS: Module description. +#: FavoriteModule.php:508 msgid "Favorites (likes) using ActivityStreams." msgstr "" diff --git a/modules/Favorite/locale/mg/LC_MESSAGES/Favorite.po b/modules/Favorite/locale/mg/LC_MESSAGES/Favorite.po index 45c459450e..547582762f 100644 --- a/modules/Favorite/locale/mg/LC_MESSAGES/Favorite.po +++ b/modules/Favorite/locale/mg/LC_MESSAGES/Favorite.po @@ -31,31 +31,31 @@ msgid "Disfavor favorite" msgstr "" #. TRANS: Help message for IM/SMS command "fav ". -#: FavoritePlugin.php:415 +#: FavoriteModule.php:415 msgctxt "COMMANDHELP" msgid "add user's last notice as a 'fave'" msgstr "" #. TRANS: Help message for IM/SMS command "fav #". -#: FavoritePlugin.php:417 +#: FavoriteModule.php:417 msgctxt "COMMANDHELP" msgid "add notice with the given id as a 'fave'" msgstr "" #. TRANS: Menu item in personal group navigation menu. -#: FavoritePlugin.php:469 +#: FavoriteModule.php:469 msgctxt "MENU" msgid "Favorites" msgstr "" #. TRANS: Menu item in search group navigation panel. -#: FavoritePlugin.php:482 +#: FavoriteModule.php:482 msgctxt "MENU" msgid "Popular" msgstr "" -#. TRANS: Plugin description. -#: FavoritePlugin.php:508 +#. TRANS: Module description. +#: FavoriteModule.php:508 msgid "Favorites (likes) using ActivityStreams." msgstr "" diff --git a/modules/Favorite/locale/mk/LC_MESSAGES/Favorite.po b/modules/Favorite/locale/mk/LC_MESSAGES/Favorite.po index 5601fcfe19..03a8d8d89e 100644 --- a/modules/Favorite/locale/mk/LC_MESSAGES/Favorite.po +++ b/modules/Favorite/locale/mk/LC_MESSAGES/Favorite.po @@ -31,31 +31,31 @@ msgid "Disfavor favorite" msgstr "" #. TRANS: Help message for IM/SMS command "fav ". -#: FavoritePlugin.php:415 +#: FavoriteModule.php:415 msgctxt "COMMANDHELP" msgid "add user's last notice as a 'fave'" msgstr "" #. TRANS: Help message for IM/SMS command "fav #". -#: FavoritePlugin.php:417 +#: FavoriteModule.php:417 msgctxt "COMMANDHELP" msgid "add notice with the given id as a 'fave'" msgstr "" #. TRANS: Menu item in personal group navigation menu. -#: FavoritePlugin.php:469 +#: FavoriteModule.php:469 msgctxt "MENU" msgid "Favorites" msgstr "" #. TRANS: Menu item in search group navigation panel. -#: FavoritePlugin.php:482 +#: FavoriteModule.php:482 msgctxt "MENU" msgid "Popular" msgstr "Популарни" -#. TRANS: Plugin description. -#: FavoritePlugin.php:508 +#. TRANS: Module description. +#: FavoriteModule.php:508 msgid "Favorites (likes) using ActivityStreams." msgstr "" diff --git a/modules/Favorite/locale/ml/LC_MESSAGES/Favorite.po b/modules/Favorite/locale/ml/LC_MESSAGES/Favorite.po index 194acf5b4d..9a10ad7077 100644 --- a/modules/Favorite/locale/ml/LC_MESSAGES/Favorite.po +++ b/modules/Favorite/locale/ml/LC_MESSAGES/Favorite.po @@ -31,31 +31,31 @@ msgid "Disfavor favorite" msgstr "" #. TRANS: Help message for IM/SMS command "fav ". -#: FavoritePlugin.php:415 +#: FavoriteModule.php:415 msgctxt "COMMANDHELP" msgid "add user's last notice as a 'fave'" msgstr "" #. TRANS: Help message for IM/SMS command "fav #". -#: FavoritePlugin.php:417 +#: FavoriteModule.php:417 msgctxt "COMMANDHELP" msgid "add notice with the given id as a 'fave'" msgstr "" #. TRANS: Menu item in personal group navigation menu. -#: FavoritePlugin.php:469 +#: FavoriteModule.php:469 msgctxt "MENU" msgid "Favorites" msgstr "" #. TRANS: Menu item in search group navigation panel. -#: FavoritePlugin.php:482 +#: FavoriteModule.php:482 msgctxt "MENU" msgid "Popular" msgstr "" -#. TRANS: Plugin description. -#: FavoritePlugin.php:508 +#. TRANS: Module description. +#: FavoriteModule.php:508 msgid "Favorites (likes) using ActivityStreams." msgstr "" diff --git a/modules/Favorite/locale/ms/LC_MESSAGES/Favorite.po b/modules/Favorite/locale/ms/LC_MESSAGES/Favorite.po index bb0744b58c..26d362632e 100644 --- a/modules/Favorite/locale/ms/LC_MESSAGES/Favorite.po +++ b/modules/Favorite/locale/ms/LC_MESSAGES/Favorite.po @@ -31,31 +31,31 @@ msgid "Disfavor favorite" msgstr "" #. TRANS: Help message for IM/SMS command "fav ". -#: FavoritePlugin.php:415 +#: FavoriteModule.php:415 msgctxt "COMMANDHELP" msgid "add user's last notice as a 'fave'" msgstr "" #. TRANS: Help message for IM/SMS command "fav #". -#: FavoritePlugin.php:417 +#: FavoriteModule.php:417 msgctxt "COMMANDHELP" msgid "add notice with the given id as a 'fave'" msgstr "" #. TRANS: Menu item in personal group navigation menu. -#: FavoritePlugin.php:469 +#: FavoriteModule.php:469 msgctxt "MENU" msgid "Favorites" msgstr "" #. TRANS: Menu item in search group navigation panel. -#: FavoritePlugin.php:482 +#: FavoriteModule.php:482 msgctxt "MENU" msgid "Popular" msgstr "" -#. TRANS: Plugin description. -#: FavoritePlugin.php:508 +#. TRANS: Module description. +#: FavoriteModule.php:508 msgid "Favorites (likes) using ActivityStreams." msgstr "" diff --git a/modules/Favorite/locale/my/LC_MESSAGES/Favorite.po b/modules/Favorite/locale/my/LC_MESSAGES/Favorite.po index 1524e13fad..584eeae7b2 100644 --- a/modules/Favorite/locale/my/LC_MESSAGES/Favorite.po +++ b/modules/Favorite/locale/my/LC_MESSAGES/Favorite.po @@ -31,31 +31,31 @@ msgid "Disfavor favorite" msgstr "" #. TRANS: Help message for IM/SMS command "fav ". -#: FavoritePlugin.php:415 +#: FavoriteModule.php:415 msgctxt "COMMANDHELP" msgid "add user's last notice as a 'fave'" msgstr "" #. TRANS: Help message for IM/SMS command "fav #". -#: FavoritePlugin.php:417 +#: FavoriteModule.php:417 msgctxt "COMMANDHELP" msgid "add notice with the given id as a 'fave'" msgstr "" #. TRANS: Menu item in personal group navigation menu. -#: FavoritePlugin.php:469 +#: FavoriteModule.php:469 msgctxt "MENU" msgid "Favorites" msgstr "" #. TRANS: Menu item in search group navigation panel. -#: FavoritePlugin.php:482 +#: FavoriteModule.php:482 msgctxt "MENU" msgid "Popular" msgstr "" -#. TRANS: Plugin description. -#: FavoritePlugin.php:508 +#. TRANS: Module description. +#: FavoriteModule.php:508 msgid "Favorites (likes) using ActivityStreams." msgstr "" diff --git a/modules/Favorite/locale/nb/LC_MESSAGES/Favorite.po b/modules/Favorite/locale/nb/LC_MESSAGES/Favorite.po index f072b8f604..7a852e58f5 100644 --- a/modules/Favorite/locale/nb/LC_MESSAGES/Favorite.po +++ b/modules/Favorite/locale/nb/LC_MESSAGES/Favorite.po @@ -31,31 +31,31 @@ msgid "Disfavor favorite" msgstr "" #. TRANS: Help message for IM/SMS command "fav ". -#: FavoritePlugin.php:415 +#: FavoriteModule.php:415 msgctxt "COMMANDHELP" msgid "add user's last notice as a 'fave'" msgstr "" #. TRANS: Help message for IM/SMS command "fav #". -#: FavoritePlugin.php:417 +#: FavoriteModule.php:417 msgctxt "COMMANDHELP" msgid "add notice with the given id as a 'fave'" msgstr "" #. TRANS: Menu item in personal group navigation menu. -#: FavoritePlugin.php:469 +#: FavoriteModule.php:469 msgctxt "MENU" msgid "Favorites" msgstr "" #. TRANS: Menu item in search group navigation panel. -#: FavoritePlugin.php:482 +#: FavoriteModule.php:482 msgctxt "MENU" msgid "Popular" msgstr "" -#. TRANS: Plugin description. -#: FavoritePlugin.php:508 +#. TRANS: Module description. +#: FavoriteModule.php:508 msgid "Favorites (likes) using ActivityStreams." msgstr "" diff --git a/modules/Favorite/locale/ne/LC_MESSAGES/Favorite.po b/modules/Favorite/locale/ne/LC_MESSAGES/Favorite.po index 4ae846d391..6d433ce395 100644 --- a/modules/Favorite/locale/ne/LC_MESSAGES/Favorite.po +++ b/modules/Favorite/locale/ne/LC_MESSAGES/Favorite.po @@ -31,31 +31,31 @@ msgid "Disfavor favorite" msgstr "" #. TRANS: Help message for IM/SMS command "fav ". -#: FavoritePlugin.php:415 +#: FavoriteModule.php:415 msgctxt "COMMANDHELP" msgid "add user's last notice as a 'fave'" msgstr "" #. TRANS: Help message for IM/SMS command "fav #". -#: FavoritePlugin.php:417 +#: FavoriteModule.php:417 msgctxt "COMMANDHELP" msgid "add notice with the given id as a 'fave'" msgstr "" #. TRANS: Menu item in personal group navigation menu. -#: FavoritePlugin.php:469 +#: FavoriteModule.php:469 msgctxt "MENU" msgid "Favorites" msgstr "" #. TRANS: Menu item in search group navigation panel. -#: FavoritePlugin.php:482 +#: FavoriteModule.php:482 msgctxt "MENU" msgid "Popular" msgstr "" -#. TRANS: Plugin description. -#: FavoritePlugin.php:508 +#. TRANS: Module description. +#: FavoriteModule.php:508 msgid "Favorites (likes) using ActivityStreams." msgstr "" diff --git a/modules/Favorite/locale/nl/LC_MESSAGES/Favorite.po b/modules/Favorite/locale/nl/LC_MESSAGES/Favorite.po index fea5ffd635..4968e678a8 100644 --- a/modules/Favorite/locale/nl/LC_MESSAGES/Favorite.po +++ b/modules/Favorite/locale/nl/LC_MESSAGES/Favorite.po @@ -31,31 +31,31 @@ msgid "Disfavor favorite" msgstr "" #. TRANS: Help message for IM/SMS command "fav ". -#: FavoritePlugin.php:415 +#: FavoriteModule.php:415 msgctxt "COMMANDHELP" msgid "add user's last notice as a 'fave'" msgstr "" #. TRANS: Help message for IM/SMS command "fav #". -#: FavoritePlugin.php:417 +#: FavoriteModule.php:417 msgctxt "COMMANDHELP" msgid "add notice with the given id as a 'fave'" msgstr "" #. TRANS: Menu item in personal group navigation menu. -#: FavoritePlugin.php:469 +#: FavoriteModule.php:469 msgctxt "MENU" msgid "Favorites" msgstr "" #. TRANS: Menu item in search group navigation panel. -#: FavoritePlugin.php:482 +#: FavoriteModule.php:482 msgctxt "MENU" msgid "Popular" msgstr "Populair" -#. TRANS: Plugin description. -#: FavoritePlugin.php:508 +#. TRANS: Module description. +#: FavoriteModule.php:508 msgid "Favorites (likes) using ActivityStreams." msgstr "" diff --git a/modules/Favorite/locale/nn/LC_MESSAGES/Favorite.po b/modules/Favorite/locale/nn/LC_MESSAGES/Favorite.po index 564eeae6bb..aede3ed4e6 100644 --- a/modules/Favorite/locale/nn/LC_MESSAGES/Favorite.po +++ b/modules/Favorite/locale/nn/LC_MESSAGES/Favorite.po @@ -31,31 +31,31 @@ msgid "Disfavor favorite" msgstr "" #. TRANS: Help message for IM/SMS command "fav ". -#: FavoritePlugin.php:415 +#: FavoriteModule.php:415 msgctxt "COMMANDHELP" msgid "add user's last notice as a 'fave'" msgstr "" #. TRANS: Help message for IM/SMS command "fav #". -#: FavoritePlugin.php:417 +#: FavoriteModule.php:417 msgctxt "COMMANDHELP" msgid "add notice with the given id as a 'fave'" msgstr "" #. TRANS: Menu item in personal group navigation menu. -#: FavoritePlugin.php:469 +#: FavoriteModule.php:469 msgctxt "MENU" msgid "Favorites" msgstr "" #. TRANS: Menu item in search group navigation panel. -#: FavoritePlugin.php:482 +#: FavoriteModule.php:482 msgctxt "MENU" msgid "Popular" msgstr "" -#. TRANS: Plugin description. -#: FavoritePlugin.php:508 +#. TRANS: Module description. +#: FavoriteModule.php:508 msgid "Favorites (likes) using ActivityStreams." msgstr "" diff --git a/modules/Favorite/locale/pl/LC_MESSAGES/Favorite.po b/modules/Favorite/locale/pl/LC_MESSAGES/Favorite.po index af2ef4b581..f7f4add5ea 100644 --- a/modules/Favorite/locale/pl/LC_MESSAGES/Favorite.po +++ b/modules/Favorite/locale/pl/LC_MESSAGES/Favorite.po @@ -31,31 +31,31 @@ msgid "Disfavor favorite" msgstr "" #. TRANS: Help message for IM/SMS command "fav ". -#: FavoritePlugin.php:415 +#: FavoriteModule.php:415 msgctxt "COMMANDHELP" msgid "add user's last notice as a 'fave'" msgstr "" #. TRANS: Help message for IM/SMS command "fav #". -#: FavoritePlugin.php:417 +#: FavoriteModule.php:417 msgctxt "COMMANDHELP" msgid "add notice with the given id as a 'fave'" msgstr "" #. TRANS: Menu item in personal group navigation menu. -#: FavoritePlugin.php:469 +#: FavoriteModule.php:469 msgctxt "MENU" msgid "Favorites" msgstr "" #. TRANS: Menu item in search group navigation panel. -#: FavoritePlugin.php:482 +#: FavoriteModule.php:482 msgctxt "MENU" msgid "Popular" msgstr "" -#. TRANS: Plugin description. -#: FavoritePlugin.php:508 +#. TRANS: Module description. +#: FavoriteModule.php:508 msgid "Favorites (likes) using ActivityStreams." msgstr "" diff --git a/modules/Favorite/locale/pt/LC_MESSAGES/Favorite.po b/modules/Favorite/locale/pt/LC_MESSAGES/Favorite.po index 861c6b1fad..3cbedf9f89 100644 --- a/modules/Favorite/locale/pt/LC_MESSAGES/Favorite.po +++ b/modules/Favorite/locale/pt/LC_MESSAGES/Favorite.po @@ -31,31 +31,31 @@ msgid "Disfavor favorite" msgstr "" #. TRANS: Help message for IM/SMS command "fav ". -#: FavoritePlugin.php:415 +#: FavoriteModule.php:415 msgctxt "COMMANDHELP" msgid "add user's last notice as a 'fave'" msgstr "" #. TRANS: Help message for IM/SMS command "fav #". -#: FavoritePlugin.php:417 +#: FavoriteModule.php:417 msgctxt "COMMANDHELP" msgid "add notice with the given id as a 'fave'" msgstr "" #. TRANS: Menu item in personal group navigation menu. -#: FavoritePlugin.php:469 +#: FavoriteModule.php:469 msgctxt "MENU" msgid "Favorites" msgstr "" #. TRANS: Menu item in search group navigation panel. -#: FavoritePlugin.php:482 +#: FavoriteModule.php:482 msgctxt "MENU" msgid "Popular" msgstr "" -#. TRANS: Plugin description. -#: FavoritePlugin.php:508 +#. TRANS: Module description. +#: FavoriteModule.php:508 msgid "Favorites (likes) using ActivityStreams." msgstr "" diff --git a/modules/Favorite/locale/pt_BR/LC_MESSAGES/Favorite.po b/modules/Favorite/locale/pt_BR/LC_MESSAGES/Favorite.po index 6b765dac7e..fa80f3cc06 100644 --- a/modules/Favorite/locale/pt_BR/LC_MESSAGES/Favorite.po +++ b/modules/Favorite/locale/pt_BR/LC_MESSAGES/Favorite.po @@ -31,31 +31,31 @@ msgid "Disfavor favorite" msgstr "Desfavorecer favorito" #. TRANS: Help message for IM/SMS command "fav ". -#: FavoritePlugin.php:415 +#: FavoriteModule.php:415 msgctxt "COMMANDHELP" msgid "add user's last notice as a 'fave'" msgstr "" #. TRANS: Help message for IM/SMS command "fav #". -#: FavoritePlugin.php:417 +#: FavoriteModule.php:417 msgctxt "COMMANDHELP" msgid "add notice with the given id as a 'fave'" msgstr "" #. TRANS: Menu item in personal group navigation menu. -#: FavoritePlugin.php:469 +#: FavoriteModule.php:469 msgctxt "MENU" msgid "Favorites" msgstr "" #. TRANS: Menu item in search group navigation panel. -#: FavoritePlugin.php:482 +#: FavoriteModule.php:482 msgctxt "MENU" msgid "Popular" msgstr "" -#. TRANS: Plugin description. -#: FavoritePlugin.php:508 +#. TRANS: Module description. +#: FavoriteModule.php:508 msgid "Favorites (likes) using ActivityStreams." msgstr "" diff --git a/modules/Favorite/locale/ro_RO/LC_MESSAGES/Favorite.po b/modules/Favorite/locale/ro_RO/LC_MESSAGES/Favorite.po index 033c30aad5..4ab48eb29c 100644 --- a/modules/Favorite/locale/ro_RO/LC_MESSAGES/Favorite.po +++ b/modules/Favorite/locale/ro_RO/LC_MESSAGES/Favorite.po @@ -31,31 +31,31 @@ msgid "Disfavor favorite" msgstr "" #. TRANS: Help message for IM/SMS command "fav ". -#: FavoritePlugin.php:415 +#: FavoriteModule.php:415 msgctxt "COMMANDHELP" msgid "add user's last notice as a 'fave'" msgstr "" #. TRANS: Help message for IM/SMS command "fav #". -#: FavoritePlugin.php:417 +#: FavoriteModule.php:417 msgctxt "COMMANDHELP" msgid "add notice with the given id as a 'fave'" msgstr "" #. TRANS: Menu item in personal group navigation menu. -#: FavoritePlugin.php:469 +#: FavoriteModule.php:469 msgctxt "MENU" msgid "Favorites" msgstr "" #. TRANS: Menu item in search group navigation panel. -#: FavoritePlugin.php:482 +#: FavoriteModule.php:482 msgctxt "MENU" msgid "Popular" msgstr "" -#. TRANS: Plugin description. -#: FavoritePlugin.php:508 +#. TRANS: Module description. +#: FavoriteModule.php:508 msgid "Favorites (likes) using ActivityStreams." msgstr "" diff --git a/modules/Favorite/locale/ru/LC_MESSAGES/Favorite.po b/modules/Favorite/locale/ru/LC_MESSAGES/Favorite.po index 4566d7d551..84c7b8baea 100644 --- a/modules/Favorite/locale/ru/LC_MESSAGES/Favorite.po +++ b/modules/Favorite/locale/ru/LC_MESSAGES/Favorite.po @@ -31,31 +31,31 @@ msgid "Disfavor favorite" msgstr "Удалить из избранного" #. TRANS: Help message for IM/SMS command "fav ". -#: FavoritePlugin.php:415 +#: FavoriteModule.php:415 msgctxt "COMMANDHELP" msgid "add user's last notice as a 'fave'" msgstr "" #. TRANS: Help message for IM/SMS command "fav #". -#: FavoritePlugin.php:417 +#: FavoriteModule.php:417 msgctxt "COMMANDHELP" msgid "add notice with the given id as a 'fave'" msgstr "" #. TRANS: Menu item in personal group navigation menu. -#: FavoritePlugin.php:469 +#: FavoriteModule.php:469 msgctxt "MENU" msgid "Favorites" msgstr "" #. TRANS: Menu item in search group navigation panel. -#: FavoritePlugin.php:482 +#: FavoriteModule.php:482 msgctxt "MENU" msgid "Popular" msgstr "Популярное" -#. TRANS: Plugin description. -#: FavoritePlugin.php:508 +#. TRANS: Module description. +#: FavoriteModule.php:508 msgid "Favorites (likes) using ActivityStreams." msgstr "" diff --git a/modules/Favorite/locale/sl/LC_MESSAGES/Favorite.po b/modules/Favorite/locale/sl/LC_MESSAGES/Favorite.po index 7628061e08..23f4eb9af2 100644 --- a/modules/Favorite/locale/sl/LC_MESSAGES/Favorite.po +++ b/modules/Favorite/locale/sl/LC_MESSAGES/Favorite.po @@ -31,31 +31,31 @@ msgid "Disfavor favorite" msgstr "" #. TRANS: Help message for IM/SMS command "fav ". -#: FavoritePlugin.php:415 +#: FavoriteModule.php:415 msgctxt "COMMANDHELP" msgid "add user's last notice as a 'fave'" msgstr "" #. TRANS: Help message for IM/SMS command "fav #". -#: FavoritePlugin.php:417 +#: FavoriteModule.php:417 msgctxt "COMMANDHELP" msgid "add notice with the given id as a 'fave'" msgstr "" #. TRANS: Menu item in personal group navigation menu. -#: FavoritePlugin.php:469 +#: FavoriteModule.php:469 msgctxt "MENU" msgid "Favorites" msgstr "" #. TRANS: Menu item in search group navigation panel. -#: FavoritePlugin.php:482 +#: FavoriteModule.php:482 msgctxt "MENU" msgid "Popular" msgstr "" -#. TRANS: Plugin description. -#: FavoritePlugin.php:508 +#. TRANS: Module description. +#: FavoriteModule.php:508 msgid "Favorites (likes) using ActivityStreams." msgstr "" diff --git a/modules/Favorite/locale/sr-ec/LC_MESSAGES/Favorite.po b/modules/Favorite/locale/sr-ec/LC_MESSAGES/Favorite.po index cbbc3bde8f..a4f3537111 100644 --- a/modules/Favorite/locale/sr-ec/LC_MESSAGES/Favorite.po +++ b/modules/Favorite/locale/sr-ec/LC_MESSAGES/Favorite.po @@ -31,31 +31,31 @@ msgid "Disfavor favorite" msgstr "" #. TRANS: Help message for IM/SMS command "fav ". -#: FavoritePlugin.php:415 +#: FavoriteModule.php:415 msgctxt "COMMANDHELP" msgid "add user's last notice as a 'fave'" msgstr "" #. TRANS: Help message for IM/SMS command "fav #". -#: FavoritePlugin.php:417 +#: FavoriteModule.php:417 msgctxt "COMMANDHELP" msgid "add notice with the given id as a 'fave'" msgstr "" #. TRANS: Menu item in personal group navigation menu. -#: FavoritePlugin.php:469 +#: FavoriteModule.php:469 msgctxt "MENU" msgid "Favorites" msgstr "" #. TRANS: Menu item in search group navigation panel. -#: FavoritePlugin.php:482 +#: FavoriteModule.php:482 msgctxt "MENU" msgid "Popular" msgstr "" -#. TRANS: Plugin description. -#: FavoritePlugin.php:508 +#. TRANS: Module description. +#: FavoriteModule.php:508 msgid "Favorites (likes) using ActivityStreams." msgstr "" diff --git a/modules/Favorite/locale/sv/LC_MESSAGES/Favorite.po b/modules/Favorite/locale/sv/LC_MESSAGES/Favorite.po index 96d04609e2..b83c8c2512 100644 --- a/modules/Favorite/locale/sv/LC_MESSAGES/Favorite.po +++ b/modules/Favorite/locale/sv/LC_MESSAGES/Favorite.po @@ -32,31 +32,31 @@ msgid "Disfavor favorite" msgstr "Avfavorisera favoriten" #. TRANS: Help message for IM/SMS command "fav ". -#: FavoritePlugin.php:415 +#: FavoriteModule.php:415 msgctxt "COMMANDHELP" msgid "add user's last notice as a 'fave'" msgstr "" #. TRANS: Help message for IM/SMS command "fav #". -#: FavoritePlugin.php:417 +#: FavoriteModule.php:417 msgctxt "COMMANDHELP" msgid "add notice with the given id as a 'fave'" msgstr "" #. TRANS: Menu item in personal group navigation menu. -#: FavoritePlugin.php:469 +#: FavoriteModule.php:469 msgctxt "MENU" msgid "Favorites" msgstr "Favoriter" #. TRANS: Menu item in search group navigation panel. -#: FavoritePlugin.php:482 +#: FavoriteModule.php:482 msgctxt "MENU" msgid "Popular" msgstr "Populära" -#. TRANS: Plugin description. -#: FavoritePlugin.php:508 +#. TRANS: Module description. +#: FavoriteModule.php:508 msgid "Favorites (likes) using ActivityStreams." msgstr "Favoriter (gillningar) som använder ActivityStreams." diff --git a/modules/Favorite/locale/ta/LC_MESSAGES/Favorite.po b/modules/Favorite/locale/ta/LC_MESSAGES/Favorite.po index 684b31a172..03be2d6e66 100644 --- a/modules/Favorite/locale/ta/LC_MESSAGES/Favorite.po +++ b/modules/Favorite/locale/ta/LC_MESSAGES/Favorite.po @@ -31,31 +31,31 @@ msgid "Disfavor favorite" msgstr "" #. TRANS: Help message for IM/SMS command "fav ". -#: FavoritePlugin.php:415 +#: FavoriteModule.php:415 msgctxt "COMMANDHELP" msgid "add user's last notice as a 'fave'" msgstr "" #. TRANS: Help message for IM/SMS command "fav #". -#: FavoritePlugin.php:417 +#: FavoriteModule.php:417 msgctxt "COMMANDHELP" msgid "add notice with the given id as a 'fave'" msgstr "" #. TRANS: Menu item in personal group navigation menu. -#: FavoritePlugin.php:469 +#: FavoriteModule.php:469 msgctxt "MENU" msgid "Favorites" msgstr "" #. TRANS: Menu item in search group navigation panel. -#: FavoritePlugin.php:482 +#: FavoriteModule.php:482 msgctxt "MENU" msgid "Popular" msgstr "" -#. TRANS: Plugin description. -#: FavoritePlugin.php:508 +#. TRANS: Module description. +#: FavoriteModule.php:508 msgid "Favorites (likes) using ActivityStreams." msgstr "" diff --git a/modules/Favorite/locale/te/LC_MESSAGES/Favorite.po b/modules/Favorite/locale/te/LC_MESSAGES/Favorite.po index 46a72e824e..1ca3789220 100644 --- a/modules/Favorite/locale/te/LC_MESSAGES/Favorite.po +++ b/modules/Favorite/locale/te/LC_MESSAGES/Favorite.po @@ -31,31 +31,31 @@ msgid "Disfavor favorite" msgstr "" #. TRANS: Help message for IM/SMS command "fav ". -#: FavoritePlugin.php:415 +#: FavoriteModule.php:415 msgctxt "COMMANDHELP" msgid "add user's last notice as a 'fave'" msgstr "" #. TRANS: Help message for IM/SMS command "fav #". -#: FavoritePlugin.php:417 +#: FavoriteModule.php:417 msgctxt "COMMANDHELP" msgid "add notice with the given id as a 'fave'" msgstr "" #. TRANS: Menu item in personal group navigation menu. -#: FavoritePlugin.php:469 +#: FavoriteModule.php:469 msgctxt "MENU" msgid "Favorites" msgstr "" #. TRANS: Menu item in search group navigation panel. -#: FavoritePlugin.php:482 +#: FavoriteModule.php:482 msgctxt "MENU" msgid "Popular" msgstr "ప్రాచుర్యం" -#. TRANS: Plugin description. -#: FavoritePlugin.php:508 +#. TRANS: Module description. +#: FavoriteModule.php:508 msgid "Favorites (likes) using ActivityStreams." msgstr "" diff --git a/modules/Favorite/locale/tl/LC_MESSAGES/Favorite.po b/modules/Favorite/locale/tl/LC_MESSAGES/Favorite.po index 10690f4ab9..8b784278db 100644 --- a/modules/Favorite/locale/tl/LC_MESSAGES/Favorite.po +++ b/modules/Favorite/locale/tl/LC_MESSAGES/Favorite.po @@ -31,31 +31,31 @@ msgid "Disfavor favorite" msgstr "" #. TRANS: Help message for IM/SMS command "fav ". -#: FavoritePlugin.php:415 +#: FavoriteModule.php:415 msgctxt "COMMANDHELP" msgid "add user's last notice as a 'fave'" msgstr "" #. TRANS: Help message for IM/SMS command "fav #". -#: FavoritePlugin.php:417 +#: FavoriteModule.php:417 msgctxt "COMMANDHELP" msgid "add notice with the given id as a 'fave'" msgstr "" #. TRANS: Menu item in personal group navigation menu. -#: FavoritePlugin.php:469 +#: FavoriteModule.php:469 msgctxt "MENU" msgid "Favorites" msgstr "" #. TRANS: Menu item in search group navigation panel. -#: FavoritePlugin.php:482 +#: FavoriteModule.php:482 msgctxt "MENU" msgid "Popular" msgstr "Tanyag" -#. TRANS: Plugin description. -#: FavoritePlugin.php:508 +#. TRANS: Module description. +#: FavoriteModule.php:508 msgid "Favorites (likes) using ActivityStreams." msgstr "" diff --git a/modules/Favorite/locale/tr/LC_MESSAGES/Favorite.po b/modules/Favorite/locale/tr/LC_MESSAGES/Favorite.po index f67442c5ac..079222fa2d 100644 --- a/modules/Favorite/locale/tr/LC_MESSAGES/Favorite.po +++ b/modules/Favorite/locale/tr/LC_MESSAGES/Favorite.po @@ -31,31 +31,31 @@ msgid "Disfavor favorite" msgstr "" #. TRANS: Help message for IM/SMS command "fav ". -#: FavoritePlugin.php:415 +#: FavoriteModule.php:415 msgctxt "COMMANDHELP" msgid "add user's last notice as a 'fave'" msgstr "" #. TRANS: Help message for IM/SMS command "fav #". -#: FavoritePlugin.php:417 +#: FavoriteModule.php:417 msgctxt "COMMANDHELP" msgid "add notice with the given id as a 'fave'" msgstr "" #. TRANS: Menu item in personal group navigation menu. -#: FavoritePlugin.php:469 +#: FavoriteModule.php:469 msgctxt "MENU" msgid "Favorites" msgstr "" #. TRANS: Menu item in search group navigation panel. -#: FavoritePlugin.php:482 +#: FavoriteModule.php:482 msgctxt "MENU" msgid "Popular" msgstr "Popüler" -#. TRANS: Plugin description. -#: FavoritePlugin.php:508 +#. TRANS: Module description. +#: FavoriteModule.php:508 msgid "Favorites (likes) using ActivityStreams." msgstr "" diff --git a/modules/Favorite/locale/uk/LC_MESSAGES/Favorite.po b/modules/Favorite/locale/uk/LC_MESSAGES/Favorite.po index b6eb04a0ec..b62ca30104 100644 --- a/modules/Favorite/locale/uk/LC_MESSAGES/Favorite.po +++ b/modules/Favorite/locale/uk/LC_MESSAGES/Favorite.po @@ -32,31 +32,31 @@ msgid "Disfavor favorite" msgstr "Видалити з обраного" #. TRANS: Help message for IM/SMS command "fav ". -#: FavoritePlugin.php:415 +#: FavoriteModule.php:415 msgctxt "COMMANDHELP" msgid "add user's last notice as a 'fave'" msgstr "" #. TRANS: Help message for IM/SMS command "fav #". -#: FavoritePlugin.php:417 +#: FavoriteModule.php:417 msgctxt "COMMANDHELP" msgid "add notice with the given id as a 'fave'" msgstr "" #. TRANS: Menu item in personal group navigation menu. -#: FavoritePlugin.php:469 +#: FavoriteModule.php:469 msgctxt "MENU" msgid "Favorites" msgstr "Обрані" #. TRANS: Menu item in search group navigation panel. -#: FavoritePlugin.php:482 +#: FavoriteModule.php:482 msgctxt "MENU" msgid "Popular" msgstr "Популярні" -#. TRANS: Plugin description. -#: FavoritePlugin.php:508 +#. TRANS: Module description. +#: FavoriteModule.php:508 msgid "Favorites (likes) using ActivityStreams." msgstr "Вибране (уподобання) з використанням ActivityStreams." diff --git a/modules/Favorite/locale/ur_PK/LC_MESSAGES/Favorite.po b/modules/Favorite/locale/ur_PK/LC_MESSAGES/Favorite.po index 4d040dadb9..ab2512dd86 100644 --- a/modules/Favorite/locale/ur_PK/LC_MESSAGES/Favorite.po +++ b/modules/Favorite/locale/ur_PK/LC_MESSAGES/Favorite.po @@ -31,31 +31,31 @@ msgid "Disfavor favorite" msgstr "" #. TRANS: Help message for IM/SMS command "fav ". -#: FavoritePlugin.php:415 +#: FavoriteModule.php:415 msgctxt "COMMANDHELP" msgid "add user's last notice as a 'fave'" msgstr "" #. TRANS: Help message for IM/SMS command "fav #". -#: FavoritePlugin.php:417 +#: FavoriteModule.php:417 msgctxt "COMMANDHELP" msgid "add notice with the given id as a 'fave'" msgstr "" #. TRANS: Menu item in personal group navigation menu. -#: FavoritePlugin.php:469 +#: FavoriteModule.php:469 msgctxt "MENU" msgid "Favorites" msgstr "" #. TRANS: Menu item in search group navigation panel. -#: FavoritePlugin.php:482 +#: FavoriteModule.php:482 msgctxt "MENU" msgid "Popular" msgstr "" -#. TRANS: Plugin description. -#: FavoritePlugin.php:508 +#. TRANS: Module description. +#: FavoriteModule.php:508 msgid "Favorites (likes) using ActivityStreams." msgstr "" diff --git a/modules/Favorite/locale/vi/LC_MESSAGES/Favorite.po b/modules/Favorite/locale/vi/LC_MESSAGES/Favorite.po index 63b39616b9..c222b61e50 100644 --- a/modules/Favorite/locale/vi/LC_MESSAGES/Favorite.po +++ b/modules/Favorite/locale/vi/LC_MESSAGES/Favorite.po @@ -31,31 +31,31 @@ msgid "Disfavor favorite" msgstr "" #. TRANS: Help message for IM/SMS command "fav ". -#: FavoritePlugin.php:415 +#: FavoriteModule.php:415 msgctxt "COMMANDHELP" msgid "add user's last notice as a 'fave'" msgstr "" #. TRANS: Help message for IM/SMS command "fav #". -#: FavoritePlugin.php:417 +#: FavoriteModule.php:417 msgctxt "COMMANDHELP" msgid "add notice with the given id as a 'fave'" msgstr "" #. TRANS: Menu item in personal group navigation menu. -#: FavoritePlugin.php:469 +#: FavoriteModule.php:469 msgctxt "MENU" msgid "Favorites" msgstr "" #. TRANS: Menu item in search group navigation panel. -#: FavoritePlugin.php:482 +#: FavoriteModule.php:482 msgctxt "MENU" msgid "Popular" msgstr "" -#. TRANS: Plugin description. -#: FavoritePlugin.php:508 +#. TRANS: Module description. +#: FavoriteModule.php:508 msgid "Favorites (likes) using ActivityStreams." msgstr "" diff --git a/modules/Favorite/locale/zh/LC_MESSAGES/Favorite.po b/modules/Favorite/locale/zh/LC_MESSAGES/Favorite.po index fab9058263..844930a365 100644 --- a/modules/Favorite/locale/zh/LC_MESSAGES/Favorite.po +++ b/modules/Favorite/locale/zh/LC_MESSAGES/Favorite.po @@ -31,31 +31,31 @@ msgid "Disfavor favorite" msgstr "" #. TRANS: Help message for IM/SMS command "fav ". -#: FavoritePlugin.php:415 +#: FavoriteModule.php:415 msgctxt "COMMANDHELP" msgid "add user's last notice as a 'fave'" msgstr "" #. TRANS: Help message for IM/SMS command "fav #". -#: FavoritePlugin.php:417 +#: FavoriteModule.php:417 msgctxt "COMMANDHELP" msgid "add notice with the given id as a 'fave'" msgstr "" #. TRANS: Menu item in personal group navigation menu. -#: FavoritePlugin.php:469 +#: FavoriteModule.php:469 msgctxt "MENU" msgid "Favorites" msgstr "" #. TRANS: Menu item in search group navigation panel. -#: FavoritePlugin.php:482 +#: FavoriteModule.php:482 msgctxt "MENU" msgid "Popular" msgstr "" -#. TRANS: Plugin description. -#: FavoritePlugin.php:508 +#. TRANS: Module description. +#: FavoriteModule.php:508 msgid "Favorites (likes) using ActivityStreams." msgstr "" diff --git a/modules/Favorite/locale/zh_CN/LC_MESSAGES/Favorite.po b/modules/Favorite/locale/zh_CN/LC_MESSAGES/Favorite.po index d0046f3fea..6bbbcf9a3c 100644 --- a/modules/Favorite/locale/zh_CN/LC_MESSAGES/Favorite.po +++ b/modules/Favorite/locale/zh_CN/LC_MESSAGES/Favorite.po @@ -31,31 +31,31 @@ msgid "Disfavor favorite" msgstr "" #. TRANS: Help message for IM/SMS command "fav ". -#: FavoritePlugin.php:415 +#: FavoriteModule.php:415 msgctxt "COMMANDHELP" msgid "add user's last notice as a 'fave'" msgstr "" #. TRANS: Help message for IM/SMS command "fav #". -#: FavoritePlugin.php:417 +#: FavoriteModule.php:417 msgctxt "COMMANDHELP" msgid "add notice with the given id as a 'fave'" msgstr "" #. TRANS: Menu item in personal group navigation menu. -#: FavoritePlugin.php:469 +#: FavoriteModule.php:469 msgctxt "MENU" msgid "Favorites" msgstr "" #. TRANS: Menu item in search group navigation panel. -#: FavoritePlugin.php:482 +#: FavoriteModule.php:482 msgctxt "MENU" msgid "Popular" msgstr "" -#. TRANS: Plugin description. -#: FavoritePlugin.php:508 +#. TRANS: Module description. +#: FavoriteModule.php:508 msgid "Favorites (likes) using ActivityStreams." msgstr "" diff --git a/modules/Favorite/locale/zh_TW/LC_MESSAGES/Favorite.po b/modules/Favorite/locale/zh_TW/LC_MESSAGES/Favorite.po index b51ad45497..eed23de7e0 100644 --- a/modules/Favorite/locale/zh_TW/LC_MESSAGES/Favorite.po +++ b/modules/Favorite/locale/zh_TW/LC_MESSAGES/Favorite.po @@ -32,31 +32,31 @@ msgid "Disfavor favorite" msgstr "" #. TRANS: Help message for IM/SMS command "fav ". -#: FavoritePlugin.php:415 +#: FavoriteModule.php:415 msgctxt "COMMANDHELP" msgid "add user's last notice as a 'fave'" msgstr "" #. TRANS: Help message for IM/SMS command "fav #". -#: FavoritePlugin.php:417 +#: FavoriteModule.php:417 msgctxt "COMMANDHELP" msgid "add notice with the given id as a 'fave'" msgstr "" #. TRANS: Menu item in personal group navigation menu. -#: FavoritePlugin.php:469 +#: FavoriteModule.php:469 msgctxt "MENU" msgid "Favorites" msgstr "" #. TRANS: Menu item in search group navigation panel. -#: FavoritePlugin.php:482 +#: FavoriteModule.php:482 msgctxt "MENU" msgid "Popular" msgstr "" -#. TRANS: Plugin description. -#: FavoritePlugin.php:508 +#. TRANS: Module description. +#: FavoriteModule.php:508 msgid "Favorites (likes) using ActivityStreams." msgstr "" diff --git a/modules/HTMLPurifierSchemes/HTMLPurifierSchemesPlugin.php b/modules/HTMLPurifierSchemes/HTMLPurifierSchemesModule.php similarity index 89% rename from modules/HTMLPurifierSchemes/HTMLPurifierSchemesPlugin.php rename to modules/HTMLPurifierSchemes/HTMLPurifierSchemesModule.php index 78c7a1e1c8..f59a94f57b 100644 --- a/modules/HTMLPurifierSchemes/HTMLPurifierSchemesPlugin.php +++ b/modules/HTMLPurifierSchemes/HTMLPurifierSchemesModule.php @@ -23,18 +23,18 @@ if (!defined('GNUSOCIAL')) { exit(1); } * @package Activity * @maintainer Mikael Nordfeldth */ -class HTMLPurifierSchemesPlugin extends Plugin +class HTMLPurifierSchemesModule extends Module { const PLUGIN_VERSION = '2.0.0'; - public function onPluginVersion(array &$versions) + public function onModuleVersion(array &$versions): bool { $versions[] = array('name' => 'HTMLPurifier Schemes', 'version' => self::PLUGIN_VERSION, 'author' => 'Mikael Nordfeldth', 'homepage' => 'https://gnu.io/social', 'rawdescription' => - // TRANS: Plugin description. + // TRANS: Module description. _m('Additional URI schemes for HTMLPurifier.')); return true; diff --git a/modules/HTMLPurifierSchemes/locale/HTMLPurifierSchemes.pot b/modules/HTMLPurifierSchemes/locale/HTMLPurifierSchemes.pot index c08e6e381f..630f66b098 100644 --- a/modules/HTMLPurifierSchemes/locale/HTMLPurifierSchemes.pot +++ b/modules/HTMLPurifierSchemes/locale/HTMLPurifierSchemes.pot @@ -17,7 +17,7 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#. TRANS: Plugin description. -#: HTMLPurifierSchemesPlugin.php:41 +#. TRANS: Module description. +#: HTMLPurifierSchemesModule.php:41 msgid "Additional URI schemes for HTMLPurifier." msgstr "" diff --git a/modules/Share/SharePlugin.php b/modules/Share/ShareModule.php similarity index 99% rename from modules/Share/SharePlugin.php rename to modules/Share/ShareModule.php index d2326a8808..19eeeb95b3 100644 --- a/modules/Share/SharePlugin.php +++ b/modules/Share/ShareModule.php @@ -23,7 +23,7 @@ if (!defined('GNUSOCIAL')) { exit(1); } * @package Activity * @maintainer Mikael Nordfeldth */ -class SharePlugin extends ActivityVerbHandlerPlugin +class ShareModule extends ActivityVerbHandlerModule { const PLUGIN_VERSION = '2.0.0'; @@ -359,7 +359,7 @@ class SharePlugin extends ActivityVerbHandlerPlugin return new RepeatForm($action, $target); } - public function onPluginVersion(array &$versions) + public function onModuleVersion(array &$versions): bool { $versions[] = array('name' => 'Share verb', 'version' => self::PLUGIN_VERSION, diff --git a/modules/Share/locale/Share.pot b/modules/Share/locale/Share.pot index 9dc2c4a2cd..79281485ff 100644 --- a/modules/Share/locale/Share.pot +++ b/modules/Share/locale/Share.pot @@ -19,33 +19,33 @@ msgstr "" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" #. TRANS: Client exception thrown when trying to share multiple activities at once. -#: SharePlugin.php:91 +#: ShareModule.php:91 msgid "Can only handle share activities with exactly one object." msgstr "" #. TRANS: Client exception thrown when trying to share a non-activity object. -#: SharePlugin.php:97 +#: ShareModule.php:97 msgid "Can only handle shared activities." msgstr "" -#: SharePlugin.php:108 +#: ShareModule.php:108 msgid "Shared activity does not have an id" msgstr "" #. TRANS: Help message for IM/SMS command "repeat #". -#: SharePlugin.php:329 +#: ShareModule.php:329 msgctxt "COMMANDHELP" msgid "repeat a notice with a given id" msgstr "" #. TRANS: Help message for IM/SMS command "repeat ". -#: SharePlugin.php:331 +#: ShareModule.php:331 msgctxt "COMMANDHELP" msgid "repeat the last notice from user" msgstr "" -#. TRANS: Plugin description. -#: SharePlugin.php:370 +#. TRANS: Module description. +#: ShareModule.php:370 msgid "Shares (repeats) using ActivityStreams." msgstr "" diff --git a/plugins/AccountManager/AccountManagerPlugin.php b/plugins/AccountManager/AccountManagerPlugin.php index 1b6d57e46c..5b0dfaf399 100644 --- a/plugins/AccountManager/AccountManagerPlugin.php +++ b/plugins/AccountManager/AccountManagerPlugin.php @@ -89,7 +89,7 @@ class AccountManagerPlugin extends Plugin } } - function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = array('name' => 'AccountManager', 'version' => self::PLUGIN_VERSION, diff --git a/plugins/AccountManager/locale/AccountManager.pot b/plugins/AccountManager/locale/AccountManager.pot index cdc473c782..eb98b783f5 100644 --- a/plugins/AccountManager/locale/AccountManager.pot +++ b/plugins/AccountManager/locale/AccountManager.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/ActivityPub/ActivityPubPlugin.php b/plugins/ActivityPub/ActivityPubPlugin.php index ca16fb8cd9..d5afd63116 100644 --- a/plugins/ActivityPub/ActivityPubPlugin.php +++ b/plugins/ActivityPub/ActivityPubPlugin.php @@ -206,7 +206,7 @@ class ActivityPubPlugin extends Plugin * @param array $versions * @return bool hook true */ - public function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = [ 'name' => 'ActivityPub', diff --git a/plugins/ActivitySpam/ActivitySpamPlugin.php b/plugins/ActivitySpam/ActivitySpamPlugin.php index 85f356fd0c..582dfbf355 100644 --- a/plugins/ActivitySpam/ActivitySpamPlugin.php +++ b/plugins/ActivitySpam/ActivitySpamPlugin.php @@ -219,7 +219,7 @@ class ActivitySpamPlugin extends Plugin return true; } - function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = array('name' => 'ActivitySpam', 'version' => self::PLUGIN_VERSION, diff --git a/plugins/ActivitySpam/locale/ActivitySpam.pot b/plugins/ActivitySpam/locale/ActivitySpam.pot index 392c316835..6379038b5d 100644 --- a/plugins/ActivitySpam/locale/ActivitySpam.pot +++ b/plugins/ActivitySpam/locale/ActivitySpam.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/AnonymousFave/AnonymousFavePlugin.php b/plugins/AnonymousFave/AnonymousFavePlugin.php index 47471ef390..8396bbdd20 100644 --- a/plugins/AnonymousFave/AnonymousFavePlugin.php +++ b/plugins/AnonymousFave/AnonymousFavePlugin.php @@ -271,7 +271,7 @@ class AnonymousFavePlugin extends Plugin * * @return boolean hook value */ - function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $url = 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/AnonymousFave'; diff --git a/plugins/AnonymousFave/locale/AnonymousFave.pot b/plugins/AnonymousFave/locale/AnonymousFave.pot index 262c2f8458..0dfeae8150 100644 --- a/plugins/AnonymousFave/locale/AnonymousFave.pot +++ b/plugins/AnonymousFave/locale/AnonymousFave.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,6 +17,21 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" +#. TRANS: Label for tally for number of times a notice was favored. +#: AnonymousFavePlugin.php:165 +msgid "Favored" +msgstr "" + +#. TRANS: Server exception. +#: AnonymousFavePlugin.php:198 AnonymousFavePlugin.php:209 +msgid "Could not create anonymous user session." +msgstr "" + +#. TRANS: Plugin description. +#: AnonymousFavePlugin.php:284 +msgid "Allow anonymous users to favorite notices." +msgstr "" + #. TRANS: Client error. #: actions/anondisfavor.php:59 msgid "" @@ -57,18 +72,3 @@ msgstr "" #, php-format msgid "Could not create favorite tally for notice ID %d." msgstr "" - -#. TRANS: Label for tally for number of times a notice was favored. -#: AnonymousFavePlugin.php:165 -msgid "Favored" -msgstr "" - -#. TRANS: Server exception. -#: AnonymousFavePlugin.php:198 AnonymousFavePlugin.php:209 -msgid "Could not create anonymous user session." -msgstr "" - -#. TRANS: Plugin description. -#: AnonymousFavePlugin.php:284 -msgid "Allow anonymous users to favorite notices." -msgstr "" diff --git a/plugins/AntiBrute/AntiBrutePlugin.php b/plugins/AntiBrute/AntiBrutePlugin.php index 0c18635675..ca13680a28 100644 --- a/plugins/AntiBrute/AntiBrutePlugin.php +++ b/plugins/AntiBrute/AntiBrutePlugin.php @@ -69,7 +69,7 @@ class AntiBrutePlugin extends Plugin { return true; } - public function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = array('name' => 'AntiBrute', 'version' => self::PLUGIN_VERSION, diff --git a/plugins/AntiBrute/locale/AntiBrute.pot b/plugins/AntiBrute/locale/AntiBrute.pot index e7977f3f8a..9a740aa187 100644 --- a/plugins/AntiBrute/locale/AntiBrute.pot +++ b/plugins/AntiBrute/locale/AntiBrute.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/ApiLogger/ApiLoggerPlugin.php b/plugins/ApiLogger/ApiLoggerPlugin.php index ee28e8d8a4..24100bc180 100644 --- a/plugins/ApiLogger/ApiLoggerPlugin.php +++ b/plugins/ApiLogger/ApiLoggerPlugin.php @@ -76,7 +76,7 @@ class ApiLoggerPlugin extends Plugin return true; } - function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = array('name' => 'ApiLogger', 'version' => self::PLUGIN_VERSION, diff --git a/plugins/ApiLogger/locale/ApiLogger.pot b/plugins/ApiLogger/locale/ApiLogger.pot index 4287fd82a1..705311d508 100644 --- a/plugins/ApiLogger/locale/ApiLogger.pot +++ b/plugins/ApiLogger/locale/ApiLogger.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/AutoSandbox/AutoSandboxPlugin.php b/plugins/AutoSandbox/AutoSandboxPlugin.php index 269f7d3b0d..c8fba8d37d 100644 --- a/plugins/AutoSandbox/AutoSandboxPlugin.php +++ b/plugins/AutoSandbox/AutoSandboxPlugin.php @@ -57,7 +57,7 @@ class AutoSandboxPlugin extends Plugin } } - function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = array('name' => 'AutoSandbox', 'version' => self::PLUGIN_VERSION, diff --git a/plugins/AutoSandbox/locale/AutoSandbox.pot b/plugins/AutoSandbox/locale/AutoSandbox.pot index 529823ab96..55268c775d 100644 --- a/plugins/AutoSandbox/locale/AutoSandbox.pot +++ b/plugins/AutoSandbox/locale/AutoSandbox.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/Autocomplete/AutocompletePlugin.php b/plugins/Autocomplete/AutocompletePlugin.php index 1a9252d5a5..bb59f4a0c7 100644 --- a/plugins/Autocomplete/AutocompletePlugin.php +++ b/plugins/Autocomplete/AutocompletePlugin.php @@ -54,7 +54,7 @@ class AutocompletePlugin extends Plugin ['action' => 'autocomplete']); } - function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = array('name' => 'Autocomplete', 'version' => self::PLUGIN_VERSION, diff --git a/plugins/Autocomplete/locale/Autocomplete.pot b/plugins/Autocomplete/locale/Autocomplete.pot index 5a257d9ae6..33cde3b039 100644 --- a/plugins/Autocomplete/locale/Autocomplete.pot +++ b/plugins/Autocomplete/locale/Autocomplete.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/Awesomeness/AwesomenessPlugin.php b/plugins/Awesomeness/AwesomenessPlugin.php index 1416676c93..6cc064d5fa 100644 --- a/plugins/Awesomeness/AwesomenessPlugin.php +++ b/plugins/Awesomeness/AwesomenessPlugin.php @@ -44,7 +44,7 @@ class AwesomenessPlugin extends Plugin { const PLUGIN_VERSION = '0.0.42'; - public function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = array( 'name' => 'Awesomeness', diff --git a/plugins/Awesomeness/locale/Awesomeness.pot b/plugins/Awesomeness/locale/Awesomeness.pot index 6004a2a655..b63fc71d31 100644 --- a/plugins/Awesomeness/locale/Awesomeness.pot +++ b/plugins/Awesomeness/locale/Awesomeness.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/BitlyUrl/BitlyUrlPlugin.php b/plugins/BitlyUrl/BitlyUrlPlugin.php index 3bf0399dfb..3ae5e93c0e 100644 --- a/plugins/BitlyUrl/BitlyUrlPlugin.php +++ b/plugins/BitlyUrl/BitlyUrlPlugin.php @@ -146,7 +146,7 @@ class BitlyUrlPlugin extends UrlShortenerPlugin return null; } - function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = array('name' => sprintf('BitlyUrl (%s)', $this->shortenerName), 'version' => self::PLUGIN_VERSION, diff --git a/plugins/BitlyUrl/locale/BitlyUrl.pot b/plugins/BitlyUrl/locale/BitlyUrl.pot index a6bfd95fbe..8257c9d053 100644 --- a/plugins/BitlyUrl/locale/BitlyUrl.pot +++ b/plugins/BitlyUrl/locale/BitlyUrl.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/Blacklist/BlacklistPlugin.php b/plugins/Blacklist/BlacklistPlugin.php index ca76c3e96d..c68d604399 100644 --- a/plugins/Blacklist/BlacklistPlugin.php +++ b/plugins/Blacklist/BlacklistPlugin.php @@ -263,7 +263,7 @@ class BlacklistPlugin extends Plugin * * @return boolean hook value */ - function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = array('name' => 'Blacklist', 'version' => self::PLUGIN_VERSION, diff --git a/plugins/Blacklist/locale/Blacklist.pot b/plugins/Blacklist/locale/Blacklist.pot index c616aa7add..5b75dbb59f 100644 --- a/plugins/Blacklist/locale/Blacklist.pot +++ b/plugins/Blacklist/locale/Blacklist.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/BlankAd/BlankAdPlugin.php b/plugins/BlankAd/BlankAdPlugin.php index 5670d544af..7581d5e6ba 100644 --- a/plugins/BlankAd/BlankAdPlugin.php +++ b/plugins/BlankAd/BlankAdPlugin.php @@ -118,7 +118,7 @@ class BlankAdPlugin extends UAPPlugin ''); } - function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = array('name' => 'BlankAd', 'version' => self::PLUGIN_VERSION, diff --git a/plugins/BlankAd/locale/BlankAd.pot b/plugins/BlankAd/locale/BlankAd.pot index 93c85440f6..fc8db27c8f 100644 --- a/plugins/BlankAd/locale/BlankAd.pot +++ b/plugins/BlankAd/locale/BlankAd.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/BlogspamNet/BlogspamNetPlugin.php b/plugins/BlogspamNet/BlogspamNetPlugin.php index b12877f9d7..85741bcddb 100644 --- a/plugins/BlogspamNet/BlogspamNetPlugin.php +++ b/plugins/BlogspamNet/BlogspamNetPlugin.php @@ -148,7 +148,7 @@ class BlogspamNetPlugin extends Plugin return PLUGIN_VERSION; } - function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = array('name' => 'BlogspamNet', 'version' => self::PLUGIN_VERSION, diff --git a/plugins/BlogspamNet/locale/BlogspamNet.pot b/plugins/BlogspamNet/locale/BlogspamNet.pot index 63867f6078..85a6f23057 100644 --- a/plugins/BlogspamNet/locale/BlogspamNet.pot +++ b/plugins/BlogspamNet/locale/BlogspamNet.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/Bookmark/BookmarkPlugin.php b/plugins/Bookmark/BookmarkPlugin.php index 771a46c1cc..ecb2474caf 100644 --- a/plugins/Bookmark/BookmarkPlugin.php +++ b/plugins/Bookmark/BookmarkPlugin.php @@ -178,7 +178,7 @@ class BookmarkPlugin extends MicroAppPlugin * * @return value */ - function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = array('name' => 'Bookmark', 'version' => self::PLUGIN_VERSION, diff --git a/plugins/Bookmark/locale/Bookmark.pot b/plugins/Bookmark/locale/Bookmark.pot index 34db324aaa..0eb6d59e79 100644 --- a/plugins/Bookmark/locale/Bookmark.pot +++ b/plugins/Bookmark/locale/Bookmark.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/CacheLog/CacheLogPlugin.php b/plugins/CacheLog/CacheLogPlugin.php index d83402e6c2..346d5e769b 100644 --- a/plugins/CacheLog/CacheLogPlugin.php +++ b/plugins/CacheLog/CacheLogPlugin.php @@ -98,7 +98,7 @@ class CacheLogPlugin extends Plugin return true; } - function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = array('name' => 'CacheLog', 'version' => self::PLUGIN_VERSION, diff --git a/plugins/CacheLog/locale/CacheLog.pot b/plugins/CacheLog/locale/CacheLog.pot index 5d198a1c59..6ff863dc1e 100644 --- a/plugins/CacheLog/locale/CacheLog.pot +++ b/plugins/CacheLog/locale/CacheLog.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/CasAuthentication/CasAuthenticationPlugin.php b/plugins/CasAuthentication/CasAuthenticationPlugin.php index 17c5f49d7e..7ac3594101 100644 --- a/plugins/CasAuthentication/CasAuthenticationPlugin.php +++ b/plugins/CasAuthentication/CasAuthenticationPlugin.php @@ -151,7 +151,7 @@ class CasAuthenticationPlugin extends AuthenticationPlugin $casSettings['user_whitelist']=$this->user_whitelist; } - function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = array('name' => 'CAS Authentication', 'version' => self::PLUGIN_VERSION, diff --git a/plugins/CasAuthentication/locale/CasAuthentication.pot b/plugins/CasAuthentication/locale/CasAuthentication.pot index c703518d68..0c9daff63a 100644 --- a/plugins/CasAuthentication/locale/CasAuthentication.pot +++ b/plugins/CasAuthentication/locale/CasAuthentication.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,22 +17,6 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#. TRANS: Client error displayed when trying to log in while already logged on. -#: actions/caslogin.php:29 -msgid "Already logged in." -msgstr "" - -#. TRANS: Server error displayed when trying to log in with incorrect username or password. -#. TRANS: Server error displayed when trying to log in with non-whitelisted user name (when whitelists are enabled.) -#: actions/caslogin.php:41 actions/caslogin.php:46 -msgid "Incorrect username or password." -msgstr "" - -#. TRANS: Server error displayed when login fails in CAS authentication plugin. -#: actions/caslogin.php:52 -msgid "Error setting user. You are probably not authorized." -msgstr "" - #. TRANS: Menu item. CAS is Central Authentication Service. #: CasAuthenticationPlugin.php:86 msgid "CAS" @@ -72,3 +56,19 @@ msgid "" "The CAS Authentication plugin allows for StatusNet to handle authentication " "through CAS (Central Authentication Service)." msgstr "" + +#. TRANS: Client error displayed when trying to log in while already logged on. +#: actions/caslogin.php:29 +msgid "Already logged in." +msgstr "" + +#. TRANS: Server error displayed when trying to log in with incorrect username or password. +#. TRANS: Server error displayed when trying to log in with non-whitelisted user name (when whitelists are enabled.) +#: actions/caslogin.php:41 actions/caslogin.php:46 +msgid "Incorrect username or password." +msgstr "" + +#. TRANS: Server error displayed when login fails in CAS authentication plugin. +#: actions/caslogin.php:52 +msgid "Error setting user. You are probably not authorized." +msgstr "" diff --git a/plugins/ChooseTheme/ChooseThemePlugin.php b/plugins/ChooseTheme/ChooseThemePlugin.php index bcfd5ba8a7..95f106b5a4 100644 --- a/plugins/ChooseTheme/ChooseThemePlugin.php +++ b/plugins/ChooseTheme/ChooseThemePlugin.php @@ -29,7 +29,7 @@ class ChooseThemePlugin extends Plugin { $m->connect('main/choosethemesettings', ['action' => 'choosethemesettings']); } - public function onPluginVersion(array &$versions) { + public function onPluginVersion(array &$versions): bool { $versions[] = array('name' => 'ChooseTheme', 'version' => self::PLUGIN_VERSION, diff --git a/plugins/ChooseTheme/locale/ChooseTheme.pot b/plugins/ChooseTheme/locale/ChooseTheme.pot index fb5d7e5a87..f17f9b709a 100644 --- a/plugins/ChooseTheme/locale/ChooseTheme.pot +++ b/plugins/ChooseTheme/locale/ChooseTheme.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/ClientSideShorten/ClientSideShortenPlugin.php b/plugins/ClientSideShorten/ClientSideShortenPlugin.php index 167dff56ee..a813a20b11 100644 --- a/plugins/ClientSideShorten/ClientSideShortenPlugin.php +++ b/plugins/ClientSideShorten/ClientSideShortenPlugin.php @@ -56,7 +56,7 @@ class ClientSideShortenPlugin extends Plugin } } - function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = array('name' => 'Shorten', 'version' => self::PLUGIN_VERSION, diff --git a/plugins/ClientSideShorten/locale/ClientSideShorten.pot b/plugins/ClientSideShorten/locale/ClientSideShorten.pot index 4069c2e058..a539d3540d 100644 --- a/plugins/ClientSideShorten/locale/ClientSideShorten.pot +++ b/plugins/ClientSideShorten/locale/ClientSideShorten.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,14 +17,14 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#. TRANS: Client exception thrown when a text argument is not present. -#: actions/shorten.php:56 -msgid "\"text\" argument must be specified." -msgstr "" - #. TRANS: Plugin description. #: ClientSideShortenPlugin.php:67 msgid "" "ClientSideShorten causes the web interface's notice form to automatically " "shorten URLs as they entered, and before the notice is submitted." msgstr "" + +#. TRANS: Client exception thrown when a text argument is not present. +#: actions/shorten.php:56 +msgid "\"text\" argument must be specified." +msgstr "" diff --git a/plugins/Comet/CometPlugin.php b/plugins/Comet/CometPlugin.php index 6e66846841..3ebb0d97de 100644 --- a/plugins/Comet/CometPlugin.php +++ b/plugins/Comet/CometPlugin.php @@ -106,7 +106,7 @@ class CometPlugin extends RealtimePlugin return '/' . implode('/', $path); } - function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = array('name' => 'Comet', 'version' => self::PLUGIN_VERSION, diff --git a/plugins/Comet/locale/Comet.pot b/plugins/Comet/locale/Comet.pot index 5ef3946c2d..0e765019dd 100644 --- a/plugins/Comet/locale/Comet.pot +++ b/plugins/Comet/locale/Comet.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/ConversationTree/ConversationTreePlugin.php b/plugins/ConversationTree/ConversationTreePlugin.php index 83d9742b64..4b24e540a5 100644 --- a/plugins/ConversationTree/ConversationTreePlugin.php +++ b/plugins/ConversationTree/ConversationTreePlugin.php @@ -33,7 +33,7 @@ class ConversationTreePlugin extends Plugin return false; } - public function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = array('name' => 'ConversationTree', 'version' => self::PLUGIN_VERSION, diff --git a/plugins/ConversationTree/locale/ConversationTree.pot b/plugins/ConversationTree/locale/ConversationTree.pot index fb3f8a64ad..f466b5c535 100644 --- a/plugins/ConversationTree/locale/ConversationTree.pot +++ b/plugins/ConversationTree/locale/ConversationTree.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/Cronish/CronishPlugin.php b/plugins/Cronish/CronishPlugin.php index 1b7a68a47f..6cce362625 100644 --- a/plugins/Cronish/CronishPlugin.php +++ b/plugins/Cronish/CronishPlugin.php @@ -47,7 +47,7 @@ class CronishPlugin extends Plugin { return true; } - public function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = array('name' => 'Cronish', 'version' => self::PLUGIN_VERSION, diff --git a/plugins/Cronish/locale/Cronish.pot b/plugins/Cronish/locale/Cronish.pot index 4c3fe64407..18cb634b71 100644 --- a/plugins/Cronish/locale/Cronish.pot +++ b/plugins/Cronish/locale/Cronish.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/DefaultLayout/DefaultLayoutPlugin.php b/plugins/DefaultLayout/DefaultLayoutPlugin.php index bfe01d74b7..20c916ce8e 100644 --- a/plugins/DefaultLayout/DefaultLayoutPlugin.php +++ b/plugins/DefaultLayout/DefaultLayoutPlugin.php @@ -45,7 +45,7 @@ class DefaultLayoutPlugin extends Plugin return true; } - public function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = array('name' => 'Default Layout', 'version' => self::PLUGIN_VERSION, diff --git a/plugins/DefaultLayout/locale/DefaultLayout.pot b/plugins/DefaultLayout/locale/DefaultLayout.pot index 1c3ee3e44b..cda0f60e04 100644 --- a/plugins/DefaultLayout/locale/DefaultLayout.pot +++ b/plugins/DefaultLayout/locale/DefaultLayout.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/Diaspora/DiasporaPlugin.php b/plugins/Diaspora/DiasporaPlugin.php index 3d38e7e853..b38351c48e 100644 --- a/plugins/Diaspora/DiasporaPlugin.php +++ b/plugins/Diaspora/DiasporaPlugin.php @@ -78,7 +78,7 @@ class DiasporaPlugin extends Plugin return true; } - public function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = array('name' => 'Diaspora', 'version' => self::PLUGIN_VERSION, diff --git a/plugins/Diaspora/locale/Diaspora.pot b/plugins/Diaspora/locale/Diaspora.pot index 90417a15bb..f85b64d15a 100644 --- a/plugins/Diaspora/locale/Diaspora.pot +++ b/plugins/Diaspora/locale/Diaspora.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/DirectMessage/DirectMessagePlugin.php b/plugins/DirectMessage/DirectMessagePlugin.php index 63f822fd54..8febfa586b 100644 --- a/plugins/DirectMessage/DirectMessagePlugin.php +++ b/plugins/DirectMessage/DirectMessagePlugin.php @@ -212,15 +212,17 @@ class DirectMessagePlugin extends Plugin return true; } - public function onPluginVersion(array &$versions) : bool + public function onPluginVersion(array &$versions): bool { - $versions[] = ['name' => 'Direct Message', - 'version' => self::PLUGIN_VERSION, - 'author' => 'Mikael Nordfeldth, Bruno Casteleiro', - 'homepage' => 'http://gnu.io/', - 'rawdescription' => - // TRANS: Plugin description. - _m('Direct Message to other local users.')]; + $versions[] = [ + 'name' => 'Direct Message', + 'version' => self::PLUGIN_VERSION, + 'author' => 'Mikael Nordfeldth, Bruno Casteleiro', + 'homepage' => 'https://gnu.social/', + 'rawdescription' => + // TRANS: Plugin description. + _m('Direct Message to other local users.') + ]; return true; } diff --git a/plugins/DirectMessage/locale/DirectMessage.pot b/plugins/DirectMessage/locale/DirectMessage.pot index e32ccfc4f5..649f062d91 100644 --- a/plugins/DirectMessage/locale/DirectMessage.pot +++ b/plugins/DirectMessage/locale/DirectMessage.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-21 10:51+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -19,25 +19,45 @@ msgstr "" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" #. TRANS: Menu item in personal group navigation menu. -#: DirectMessagePlugin.php:130 +#: DirectMessagePlugin.php:134 msgctxt "MENU" msgid "Messages" msgstr "" #. TRANS: Link text for link on user profile. -#: DirectMessagePlugin.php:150 +#: DirectMessagePlugin.php:167 msgctxt "BUTTON" msgid "Message" msgstr "" #. TRANS: Plugin description. -#: DirectMessagePlugin.php:176 -msgid "Direct Message to other local users (broken out of core)." +#: DirectMessagePlugin.php:223 +msgid "Direct Message to other local users." +msgstr "" + +#. TRANS: Form legend for direct notice. +#: lib/messageform.php:99 +msgid "Send a direct notice" +msgstr "" + +#. TRANS: Label entry in drop-down selection box in direct-message inbox/outbox. +#. TRANS: This is the default entry in the drop-down box, doubling as instructions +#. TRANS: and a brake against accidental submissions with the first user in the list. +#: lib/messageform.php:157 +msgid "No subscriptions" +msgstr "" + +#: lib/messageform.php:157 +msgid "Select recipient:" +msgstr "" + +#: lib/messageform.php:164 +msgid "To" msgstr "" #. TRANS: Button text for sending a direct notice. -#: lib/messageform.php:175 -msgctxt "Send button for sending notice" +#: lib/messageform.php:199 +msgctxt "Send button for direct notice" msgid "Send" msgstr "" @@ -63,40 +83,106 @@ msgstr[0] "" msgstr[1] "" #. TRANS: A possible notice source (web interface). -#: lib/messagelistitem.php:137 +#: lib/messagelistitem.php:127 msgctxt "SOURCE" msgid "web" msgstr "" #. TRANS: A possible notice source (XMPP). -#: lib/messagelistitem.php:139 +#: lib/messagelistitem.php:129 msgctxt "SOURCE" msgid "xmpp" msgstr "" #. TRANS: A possible notice source (e-mail). -#: lib/messagelistitem.php:141 +#: lib/messagelistitem.php:131 msgctxt "SOURCE" msgid "mail" msgstr "" #. TRANS: A possible notice source (OpenMicroBlogging). -#: lib/messagelistitem.php:143 +#: lib/messagelistitem.php:133 msgctxt "SOURCE" msgid "omb" msgstr "" #. TRANS: A possible notice source (Application Programming Interface). -#: lib/messagelistitem.php:145 +#: lib/messagelistitem.php:135 msgctxt "SOURCE" msgid "api" msgstr "" +#. TRANS: Title for outbox for any but the fist page. +#. TRANS: %1$s is the user nickname, %2$d is the page number. +#: actions/outbox.php:50 +#, php-format +msgid "Outbox for %1$s - page %2$d" +msgstr "" + +#. TRANS: Title for first page of outbox. +#: actions/outbox.php:54 +#, php-format +msgid "Outbox for %s" +msgstr "" + +#. TRANS: Instructions for outbox. +#: actions/outbox.php:84 +msgid "This is your outbox, which lists private messages you have sent." +msgstr "" + +#. TRANS: Client error displayed requesting a single message that does not exist. +#: actions/showmessage.php:63 +msgid "No such message." +msgstr "" + +#. TRANS: Client error displayed requesting a single direct message the requesting user was not a party in. +#: actions/showmessage.php:83 +msgid "Only the sender and recipients may read this message." +msgstr "" + +#: actions/showmessage.php:109 +#, php-format +msgid "Message to many on %1$s" +msgstr "" + +#. TRANS: Page title for single direct message display when viewing user is the sender. +#. TRANS: %1$s is the addressed user's nickname, $2$s is a timestamp. +#: actions/showmessage.php:115 +#, php-format +msgid "Message to %1$s on %2$s" +msgstr "" + +#. TRANS: Page title for single message display. +#. TRANS: %1$s is the sending user's nickname, $2$s is a timestamp. +#: actions/showmessage.php:123 +#, php-format +msgid "Message from %1$s on %2$s" +msgstr "" + #. TRANS: Form validation error displayed when message content is too long. #. TRANS: %d is the maximum number of characters for a message. -#: actions/apidirectmessagenew.php:104 actions/newmessage.php:112 +#: actions/apidirectmessagenew.php:104 actions/newmessage.php:99 #, php-format msgid "That's too long. Maximum message size is %d character." msgid_plural "That's too long. Maximum message size is %d characters." msgstr[0] "" msgstr[1] "" + +#. TRANS: Title for all but the first page of the inbox page. +#. TRANS: %1$s is the user's nickname, %2$s is the page number. +#: actions/inbox.php:50 +#, php-format +msgid "Inbox for %1$s - page %2$d" +msgstr "" + +#. TRANS: Title for the first page of the inbox page. +#. TRANS: %s is the user's nickname. +#: actions/inbox.php:55 +#, php-format +msgid "Inbox for %s" +msgstr "" + +#. TRANS: Instructions for user inbox page. +#: actions/inbox.php:85 +msgid "This is your inbox, which lists your incoming private messages." +msgstr "" diff --git a/plugins/DirectMessage/locale/en_GB/LC_MESSAGES/DirectMessage.po b/plugins/DirectMessage/locale/en_GB/LC_MESSAGES/DirectMessage.po index 2cbcec9157..e9255eed7d 100644 --- a/plugins/DirectMessage/locale/en_GB/LC_MESSAGES/DirectMessage.po +++ b/plugins/DirectMessage/locale/en_GB/LC_MESSAGES/DirectMessage.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: GNU social\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-02-02 17:47+0100\n" -"PO-Revision-Date: 2015-03-07 18:12+0000\n" +"PO-Revision-Date: 2019-08-21 10:53+0100\n" "Last-Translator: Luke Hollins \n" "Language-Team: English (United Kingdom) (http://www.transifex.com/gnu-social/gnu-social/language/en_GB/)\n" "MIME-Version: 1.0\n" diff --git a/plugins/DirectionDetector/DirectionDetectorPlugin.php b/plugins/DirectionDetector/DirectionDetectorPlugin.php index 1f77a61acc..928c9b4647 100644 --- a/plugins/DirectionDetector/DirectionDetectorPlugin.php +++ b/plugins/DirectionDetector/DirectionDetectorPlugin.php @@ -245,7 +245,7 @@ class DirectionDetectorPlugin extends Plugin { /** * plugin details */ - function onPluginVersion(array &$versions){ + public function onPluginVersion(array &$versions): bool{ $url = 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/DirectionDetector'; $versions[] = array( diff --git a/plugins/DirectionDetector/locale/DirectionDetector.pot b/plugins/DirectionDetector/locale/DirectionDetector.pot index 8101a064c2..15465dadad 100644 --- a/plugins/DirectionDetector/locale/DirectionDetector.pot +++ b/plugins/DirectionDetector/locale/DirectionDetector.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/Directory/DirectoryPlugin.php b/plugins/Directory/DirectoryPlugin.php index 3c8d1e5910..64948fa270 100644 --- a/plugins/Directory/DirectoryPlugin.php +++ b/plugins/Directory/DirectoryPlugin.php @@ -233,7 +233,7 @@ class DirectoryPlugin extends Plugin /* * Version info */ - function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = array( 'name' => 'Directory', diff --git a/plugins/Directory/locale/Directory.pot b/plugins/Directory/locale/Directory.pot index c9be3486e2..07fd444169 100644 --- a/plugins/Directory/locale/Directory.pot +++ b/plugins/Directory/locale/Directory.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,6 +17,22 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" +#. TRANS: Menu item text for user directory. +#: DirectoryPlugin.php:223 +msgctxt "MENU" +msgid "People" +msgstr "" + +#. TRANS: Menu item title for user directory. +#: DirectoryPlugin.php:225 +msgid "People." +msgstr "" + +#. TRANS: Plugin description. +#: DirectoryPlugin.php:244 +msgid "Add a user directory." +msgstr "" + #. TRANS: Column header in table for user nickname. #: lib/sortablegrouplist.php:51 lib/sortablesubscriptionlist.php:51 msgid "Nickname" @@ -165,19 +181,3 @@ msgstr "" #, php-format msgid "No users starting with %s" msgstr "" - -#. TRANS: Menu item text for user directory. -#: DirectoryPlugin.php:223 -msgctxt "MENU" -msgid "People" -msgstr "" - -#. TRANS: Menu item title for user directory. -#: DirectoryPlugin.php:225 -msgid "People." -msgstr "" - -#. TRANS: Plugin description. -#: DirectoryPlugin.php:244 -msgid "Add a user directory." -msgstr "" diff --git a/plugins/DiskCache/DiskCachePlugin.php b/plugins/DiskCache/DiskCachePlugin.php index 39c2c59889..2eb30ca6b5 100644 --- a/plugins/DiskCache/DiskCachePlugin.php +++ b/plugins/DiskCache/DiskCachePlugin.php @@ -158,7 +158,7 @@ class DiskCachePlugin extends Plugin return false; } - function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = array('name' => 'DiskCache', 'version' => self::PLUGIN_VERSION, diff --git a/plugins/DiskCache/locale/DiskCache.pot b/plugins/DiskCache/locale/DiskCache.pot index fc17770afd..320a3f149f 100644 --- a/plugins/DiskCache/locale/DiskCache.pot +++ b/plugins/DiskCache/locale/DiskCache.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/DomainStatusNetwork/DomainStatusNetworkPlugin.php b/plugins/DomainStatusNetwork/DomainStatusNetworkPlugin.php index 64ea4baec0..71871a8807 100644 --- a/plugins/DomainStatusNetwork/DomainStatusNetworkPlugin.php +++ b/plugins/DomainStatusNetwork/DomainStatusNetworkPlugin.php @@ -192,7 +192,7 @@ class DomainStatusNetworkPlugin extends Plugin return null; } - function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = array('name' => 'DomainStatusNetwork', 'version' => self::PLUGIN_VERSION, diff --git a/plugins/DomainStatusNetwork/locale/DomainStatusNetwork.pot b/plugins/DomainStatusNetwork/locale/DomainStatusNetwork.pot index e008351ef5..519414eff2 100644 --- a/plugins/DomainStatusNetwork/locale/DomainStatusNetwork.pot +++ b/plugins/DomainStatusNetwork/locale/DomainStatusNetwork.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/DomainWhitelist/DomainWhitelistPlugin.php b/plugins/DomainWhitelist/DomainWhitelistPlugin.php index 8be03df39e..b24a9c18ac 100644 --- a/plugins/DomainWhitelist/DomainWhitelistPlugin.php +++ b/plugins/DomainWhitelist/DomainWhitelistPlugin.php @@ -269,7 +269,7 @@ class DomainWhitelistPlugin extends Plugin return true; } - function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = array('name' => 'DomainWhitelist', 'version' => self::PLUGIN_VERSION, diff --git a/plugins/DomainWhitelist/locale/DomainWhitelist.pot b/plugins/DomainWhitelist/locale/DomainWhitelist.pot index d99557af0c..35bbbc363f 100644 --- a/plugins/DomainWhitelist/locale/DomainWhitelist.pot +++ b/plugins/DomainWhitelist/locale/DomainWhitelist.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/EmailAuthentication/EmailAuthenticationPlugin.php b/plugins/EmailAuthentication/EmailAuthenticationPlugin.php index d3409f3e77..00329f7453 100644 --- a/plugins/EmailAuthentication/EmailAuthenticationPlugin.php +++ b/plugins/EmailAuthentication/EmailAuthenticationPlugin.php @@ -51,7 +51,7 @@ class EmailAuthenticationPlugin extends Plugin return true; } - function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = array('name' => 'Email Authentication', 'version' => self::PLUGIN_VERSION, diff --git a/plugins/EmailAuthentication/locale/EmailAuthentication.pot b/plugins/EmailAuthentication/locale/EmailAuthentication.pot index 6204da7f8c..85209dff0e 100644 --- a/plugins/EmailAuthentication/locale/EmailAuthentication.pot +++ b/plugins/EmailAuthentication/locale/EmailAuthentication.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/EmailRegistration/EmailRegistrationPlugin.php b/plugins/EmailRegistration/EmailRegistrationPlugin.php index 05868d2444..8bee399726 100644 --- a/plugins/EmailRegistration/EmailRegistrationPlugin.php +++ b/plugins/EmailRegistration/EmailRegistrationPlugin.php @@ -174,7 +174,7 @@ class EmailRegistrationPlugin extends Plugin return true; } - function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = array('name' => 'EmailRegistration', 'version' => self::PLUGIN_VERSION, diff --git a/plugins/EmailRegistration/locale/EmailRegistration.pot b/plugins/EmailRegistration/locale/EmailRegistration.pot index 1bf43720c7..98477b420f 100644 --- a/plugins/EmailRegistration/locale/EmailRegistration.pot +++ b/plugins/EmailRegistration/locale/EmailRegistration.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/EmailReminder/EmailReminderPlugin.php b/plugins/EmailReminder/EmailReminderPlugin.php index a9372200b3..a25b3318d8 100644 --- a/plugins/EmailReminder/EmailReminderPlugin.php +++ b/plugins/EmailReminder/EmailReminderPlugin.php @@ -181,7 +181,7 @@ class EmailReminderPlugin extends Plugin * @param type $versions * @return type */ - function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = array( 'name' => 'EmailReminder', diff --git a/plugins/EmailReminder/locale/EmailReminder.pot b/plugins/EmailReminder/locale/EmailReminder.pot index 8ffd5b1817..c24d2eec87 100644 --- a/plugins/EmailReminder/locale/EmailReminder.pot +++ b/plugins/EmailReminder/locale/EmailReminder.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/EmailSummary/EmailSummaryPlugin.php b/plugins/EmailSummary/EmailSummaryPlugin.php index 9e94cd16ee..d5b0077132 100644 --- a/plugins/EmailSummary/EmailSummaryPlugin.php +++ b/plugins/EmailSummary/EmailSummaryPlugin.php @@ -67,7 +67,7 @@ class EmailSummaryPlugin extends Plugin * * @return boolean hook value; true means continue processing, false means stop. */ - function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = array('name' => 'EmailSummary', 'version' => self::PLUGIN_VERSION, diff --git a/plugins/EmailSummary/locale/EmailSummary.pot b/plugins/EmailSummary/locale/EmailSummary.pot index b136bf76b1..b811f4c94c 100644 --- a/plugins/EmailSummary/locale/EmailSummary.pot +++ b/plugins/EmailSummary/locale/EmailSummary.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/Embed/EmbedPlugin.php b/plugins/Embed/EmbedPlugin.php index 3cc0b82b0b..602a04bf24 100644 --- a/plugins/Embed/EmbedPlugin.php +++ b/plugins/Embed/EmbedPlugin.php @@ -662,7 +662,7 @@ class EmbedPlugin extends Plugin * @param &$versions array inherited from parent * @return bool true hook value */ - public function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = ['name' => 'Embed', 'version' => self::PLUGIN_VERSION, diff --git a/plugins/Embed/locale/Embed.pot b/plugins/Embed/locale/Embed.pot index 474224ffde..58f3f2172a 100644 --- a/plugins/Embed/locale/Embed.pot +++ b/plugins/Embed/locale/Embed.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,13 +17,13 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" +#. TRANS: Plugin description. +#: EmbedPlugin.php:633 +msgid "Plugin for using and representing oEmbed, OpenGraph and other data." +msgstr "" + #. TRANS: Exception. %s is the URL we tried to GET. #: lib/embedhelper.php:87 #, php-format msgid "Could not GET URL %s." msgstr "" - -#. TRANS: Plugin description. -#: EmbedPlugin.php:634 -msgid "Plugin for using and representing oEmbed, OpenGraph and other data." -msgstr "" diff --git a/plugins/Event/EventPlugin.php b/plugins/Event/EventPlugin.php index 834f29cdf8..48d8fe3d5a 100644 --- a/plugins/Event/EventPlugin.php +++ b/plugins/Event/EventPlugin.php @@ -99,7 +99,7 @@ class EventPlugin extends ActivityVerbHandlerPlugin return true; } - function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = array('name' => 'Event', 'version' => self::PLUGIN_VERSION, diff --git a/plugins/Event/actions/newevent.php b/plugins/Event/actions/newevent.php index 023aee6c75..9e822ceb57 100644 --- a/plugins/Event/actions/newevent.php +++ b/plugins/Event/actions/newevent.php @@ -148,13 +148,13 @@ class NeweventAction extends FormAction /* We don't use these ourselves, but we add them to be nice RSS/XML citizens */ $actobj->extra[] = array('startdate', - array('xmlns' => 'http://purl.org/rss/1.0/modules/event/'), + array('xmlns' => 'http://purl.org/rss/1.0/plugins/event/'), common_date_iso8601($start_str)); $actobj->extra[] = array('enddate', - array('xmlns' => 'http://purl.org/rss/1.0/modules/event/'), + array('xmlns' => 'http://purl.org/rss/1.0/plugins/event/'), common_date_iso8601($end_str)); $actobj->extra[] = array('location', - array('xmlns' => 'http://purl.org/rss/1.0/modules/event/'), + array('xmlns' => 'http://purl.org/rss/1.0/plugins/event/'), $location); $act->objects = array($actobj); diff --git a/plugins/Event/classes/Happening.php b/plugins/Event/classes/Happening.php index d7f296f647..646a7e6d1e 100644 --- a/plugins/Event/classes/Happening.php +++ b/plugins/Event/classes/Happening.php @@ -259,13 +259,13 @@ class Happening extends Managed_DataObject /* We don't use these ourselves, but we add them to be nice RSS/XML citizens */ $actobj->extra[] = array('startdate', - array('xmlns' => 'http://purl.org/rss/1.0/modules/event/'), + array('xmlns' => 'http://purl.org/rss/1.0/plugins/event/'), common_date_iso8601($this->start_time)); $actobj->extra[] = array('enddate', - array('xmlns' => 'http://purl.org/rss/1.0/modules/event/'), + array('xmlns' => 'http://purl.org/rss/1.0/plugins/event/'), common_date_iso8601($this->end_time)); $actobj->extra[] = array('location', - array('xmlns' => 'http://purl.org/rss/1.0/modules/event/'), + array('xmlns' => 'http://purl.org/rss/1.0/plugins/event/'), $this->location); return $actobj; diff --git a/plugins/Event/locale/Event.pot b/plugins/Event/locale/Event.pot index 8ca1a8e86e..d2d47cb685 100644 --- a/plugins/Event/locale/Event.pot +++ b/plugins/Event/locale/Event.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -247,57 +247,6 @@ msgstr "" msgid "%1$s might attend %2$s." msgstr "" -#. TRANS: Plugin description. -#: EventPlugin.php:110 -msgid "Event invitations and RSVPs." -msgstr "" - -#. TRANS: Title for event application. -#: EventPlugin.php:116 -msgctxt "TITLE" -msgid "Event" -msgstr "" - -#. TRANS: Exception thrown when event plugin comes across a unknown object type. -#: EventPlugin.php:213 -msgid "Unknown object type." -msgstr "" - -#. TRANS: Field label for event description. -#: EventPlugin.php:340 -msgid "Time:" -msgstr "" - -#. TRANS: Field label for event description. -#: EventPlugin.php:357 -msgid "Location:" -msgstr "" - -#. TRANS: Field label for event description. -#: EventPlugin.php:365 -msgid "Description:" -msgstr "" - -#. TRANS: Field label for event description. -#: EventPlugin.php:375 -msgid "Attending:" -msgstr "" - -#. TRANS: Content for a deleted RSVP list item (RSVP stands for "please respond"). -#: EventPlugin.php:418 -msgid "Deleted." -msgstr "" - -#. TRANS: Menu item in sample plugin. -#: EventPlugin.php:431 -msgid "Happenings" -msgstr "" - -#. TRANS: Menu item title in sample plugin. -#: EventPlugin.php:433 -msgid "A list of your events" -msgstr "" - #. TRANS: Field label on event form. #: forms/event.php:103 msgctxt "LABEL" @@ -420,3 +369,54 @@ msgstr "" msgctxt "BUTTON" msgid "Maybe" msgstr "" + +#. TRANS: Plugin description. +#: EventPlugin.php:110 +msgid "Event invitations and RSVPs." +msgstr "" + +#. TRANS: Title for event application. +#: EventPlugin.php:116 +msgctxt "TITLE" +msgid "Event" +msgstr "" + +#. TRANS: Exception thrown when event plugin comes across a unknown object type. +#: EventPlugin.php:213 +msgid "Unknown object type." +msgstr "" + +#. TRANS: Field label for event description. +#: EventPlugin.php:340 +msgid "Time:" +msgstr "" + +#. TRANS: Field label for event description. +#: EventPlugin.php:357 +msgid "Location:" +msgstr "" + +#. TRANS: Field label for event description. +#: EventPlugin.php:365 +msgid "Description:" +msgstr "" + +#. TRANS: Field label for event description. +#: EventPlugin.php:375 +msgid "Attending:" +msgstr "" + +#. TRANS: Content for a deleted RSVP list item (RSVP stands for "please respond"). +#: EventPlugin.php:418 +msgid "Deleted." +msgstr "" + +#. TRANS: Menu item in sample plugin. +#: EventPlugin.php:431 +msgid "Happenings" +msgstr "" + +#. TRANS: Menu item title in sample plugin. +#: EventPlugin.php:433 +msgid "A list of your events" +msgstr "" diff --git a/plugins/ExtendedProfile/ExtendedProfilePlugin.php b/plugins/ExtendedProfile/ExtendedProfilePlugin.php index 6ad84378be..880f6c32a0 100644 --- a/plugins/ExtendedProfile/ExtendedProfilePlugin.php +++ b/plugins/ExtendedProfile/ExtendedProfilePlugin.php @@ -31,7 +31,7 @@ class ExtendedProfilePlugin extends Plugin { const PLUGIN_VERSION = '2.0.0'; - function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = array( 'name' => 'ExtendedProfile', diff --git a/plugins/ExtendedProfile/locale/ExtendedProfile.pot b/plugins/ExtendedProfile/locale/ExtendedProfile.pot index 8a2f3e23f7..72da6f9b83 100644 --- a/plugins/ExtendedProfile/locale/ExtendedProfile.pot +++ b/plugins/ExtendedProfile/locale/ExtendedProfile.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/FeedPoller/FeedPollerPlugin.php b/plugins/FeedPoller/FeedPollerPlugin.php index c9e68ba863..d60ffdb597 100644 --- a/plugins/FeedPoller/FeedPollerPlugin.php +++ b/plugins/FeedPoller/FeedPollerPlugin.php @@ -49,7 +49,7 @@ class FeedPollerPlugin extends Plugin { return true; } - public function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = array('name' => 'FeedPoller', 'version' => self::PLUGIN_VERSION, diff --git a/plugins/FeedPoller/locale/FeedPoller.pot b/plugins/FeedPoller/locale/FeedPoller.pot index 03be80c056..378dd0623e 100644 --- a/plugins/FeedPoller/locale/FeedPoller.pot +++ b/plugins/FeedPoller/locale/FeedPoller.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/FetchRemote/FetchRemotePlugin.php b/plugins/FetchRemote/FetchRemotePlugin.php index 9dda9b58d9..be597e20f6 100644 --- a/plugins/FetchRemote/FetchRemotePlugin.php +++ b/plugins/FetchRemote/FetchRemotePlugin.php @@ -107,7 +107,7 @@ class FetchRemotePlugin extends Plugin return true; } - public function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = array('name' => 'FetchRemote', 'version' => self::PLUGIN_VERSION, diff --git a/plugins/FetchRemote/locale/FetchRemote.pot b/plugins/FetchRemote/locale/FetchRemote.pot index 101ed8c2c8..ce7ec02385 100644 --- a/plugins/FetchRemote/locale/FetchRemote.pot +++ b/plugins/FetchRemote/locale/FetchRemote.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/FollowEveryone/FollowEveryonePlugin.php b/plugins/FollowEveryone/FollowEveryonePlugin.php index d8b1b8e67f..f5496afd27 100644 --- a/plugins/FollowEveryone/FollowEveryonePlugin.php +++ b/plugins/FollowEveryone/FollowEveryonePlugin.php @@ -167,7 +167,7 @@ class FollowEveryonePlugin extends Plugin * @return boolean hook value * */ - function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = array('name' => 'FollowEveryone', 'version' => self::PLUGIN_VERSION, diff --git a/plugins/FollowEveryone/locale/FollowEveryone.pot b/plugins/FollowEveryone/locale/FollowEveryone.pot index 0e28bf6131..0a9f4104a1 100644 --- a/plugins/FollowEveryone/locale/FollowEveryone.pot +++ b/plugins/FollowEveryone/locale/FollowEveryone.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/ForceGroup/ForceGroupPlugin.php b/plugins/ForceGroup/ForceGroupPlugin.php index 3f18f98a69..681d56332c 100644 --- a/plugins/ForceGroup/ForceGroupPlugin.php +++ b/plugins/ForceGroup/ForceGroupPlugin.php @@ -107,7 +107,7 @@ class ForceGroupPlugin extends Plugin * * @return boolean hook value */ - function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $url = 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/ForceGroup'; diff --git a/plugins/ForceGroup/locale/ForceGroup.pot b/plugins/ForceGroup/locale/ForceGroup.pot index f1df392d10..d355ff7e4a 100644 --- a/plugins/ForceGroup/locale/ForceGroup.pot +++ b/plugins/ForceGroup/locale/ForceGroup.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/GNUsocialPhoto/locale/GNUsocialPhoto.pot b/plugins/GNUsocialPhoto/locale/GNUsocialPhoto.pot index 1c641659ce..89c48331ea 100644 --- a/plugins/GNUsocialPhoto/locale/GNUsocialPhoto.pot +++ b/plugins/GNUsocialPhoto/locale/GNUsocialPhoto.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/GNUsocialPhotos/locale/GNUsocialPhotos.pot b/plugins/GNUsocialPhotos/locale/GNUsocialPhotos.pot index 7cdb5ecaca..5f9fca4516 100644 --- a/plugins/GNUsocialPhotos/locale/GNUsocialPhotos.pot +++ b/plugins/GNUsocialPhotos/locale/GNUsocialPhotos.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,6 +17,10 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" +#: GNUsocialPhotosPlugin.php:65 +msgid "Problem saving photo." +msgstr "" + #: actions/photoupload.php:57 msgid "Upload Photos" msgstr "" @@ -58,7 +62,3 @@ msgstr "" #: classes/gnusocialphotoalbum.php:98 msgid "Error creating new album." msgstr "" - -#: GNUsocialPhotosPlugin.php:65 -msgid "Problem saving photo." -msgstr "" diff --git a/plugins/GNUsocialProfileExtensions/locale/GNUsocialProfileExtensions.pot b/plugins/GNUsocialProfileExtensions/locale/GNUsocialProfileExtensions.pot index 8c3dd29fe0..59ee86196d 100644 --- a/plugins/GNUsocialProfileExtensions/locale/GNUsocialProfileExtensions.pot +++ b/plugins/GNUsocialProfileExtensions/locale/GNUsocialProfileExtensions.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/GNUsocialVideo/locale/GNUsocialVideo.pot b/plugins/GNUsocialVideo/locale/GNUsocialVideo.pot index d14e00bd19..65c7f9bf24 100644 --- a/plugins/GNUsocialVideo/locale/GNUsocialVideo.pot +++ b/plugins/GNUsocialVideo/locale/GNUsocialVideo.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/GeoURL/GeoURLPlugin.php b/plugins/GeoURL/GeoURLPlugin.php index cc22364f35..f65a1602cc 100644 --- a/plugins/GeoURL/GeoURLPlugin.php +++ b/plugins/GeoURL/GeoURLPlugin.php @@ -118,7 +118,7 @@ class GeoURLPlugin extends Plugin return true; } - function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = array('name' => 'GeoURL', 'version' => self::PLUGIN_VERSION, diff --git a/plugins/GeoURL/locale/GeoURL.pot b/plugins/GeoURL/locale/GeoURL.pot index fdfb7cf764..fce1119ab3 100644 --- a/plugins/GeoURL/locale/GeoURL.pot +++ b/plugins/GeoURL/locale/GeoURL.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/Geonames/GeonamesPlugin.php b/plugins/Geonames/GeonamesPlugin.php index aa856ea3d1..1e66ce2b26 100644 --- a/plugins/Geonames/GeonamesPlugin.php +++ b/plugins/Geonames/GeonamesPlugin.php @@ -489,7 +489,7 @@ class GeonamesPlugin extends Plugin return $document->geoname; } - function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = array('name' => 'Geonames', 'version' => self::PLUGIN_VERSION, diff --git a/plugins/Geonames/locale/Geonames.pot b/plugins/Geonames/locale/Geonames.pot index 22bdb7b8ab..6ac4212f92 100644 --- a/plugins/Geonames/locale/Geonames.pot +++ b/plugins/Geonames/locale/Geonames.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/GroupFavorited/GroupFavoritedPlugin.php b/plugins/GroupFavorited/GroupFavoritedPlugin.php index 3dd9ac1323..e42a4338e9 100644 --- a/plugins/GroupFavorited/GroupFavoritedPlugin.php +++ b/plugins/GroupFavorited/GroupFavoritedPlugin.php @@ -65,19 +65,20 @@ class GroupFavoritedPlugin extends Plugin * * @param array &$versions array of version data arrays; see EVENTS.txt * - * @return boolean hook value + * @return bool hook value */ - function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $url = 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/GroupFavorited'; - $versions[] = array('name' => 'GroupFavorited', + $versions[] = ['name' => 'GroupFavorited', 'version' => self::PLUGIN_VERSION, 'author' => 'Brion Vibber', 'homepage' => $url, 'rawdescription' => // TRANS: Plugin description. - _m('This plugin adds a menu item for popular notices in groups.')); + _m('This plugin adds a menu item for popular notices in groups.') + ]; return true; } diff --git a/plugins/GroupFavorited/locale/GroupFavorited.pot b/plugins/GroupFavorited/locale/GroupFavorited.pot index 8f6ca80dbf..84935fef01 100644 --- a/plugins/GroupFavorited/locale/GroupFavorited.pot +++ b/plugins/GroupFavorited/locale/GroupFavorited.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,18 +17,6 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#. TRANS: %s is a group name. -#: actions/groupfavorited.php:48 -#, php-format -msgid "Popular posts in %s group" -msgstr "" - -#. TRANS: %1$s is a group name, %2$s is a group number. -#: actions/groupfavorited.php:51 -#, php-format -msgid "Popular posts in %1$s group, page %2$d" -msgstr "" - #. TRANS: Menu item in the group navigation page. #: GroupFavoritedPlugin.php:53 msgctxt "MENU" @@ -47,3 +35,15 @@ msgstr "" #: GroupFavoritedPlugin.php:80 msgid "This plugin adds a menu item for popular notices in groups." msgstr "" + +#. TRANS: %s is a group name. +#: actions/groupfavorited.php:48 +#, php-format +msgid "Popular posts in %s group" +msgstr "" + +#. TRANS: %1$s is a group name, %2$s is a group number. +#: actions/groupfavorited.php:51 +#, php-format +msgid "Popular posts in %1$s group, page %2$d" +msgstr "" diff --git a/plugins/GroupPrivateMessage/GroupPrivateMessagePlugin.php b/plugins/GroupPrivateMessage/GroupPrivateMessagePlugin.php index e3148e0f1a..5c8ee1dd75 100644 --- a/plugins/GroupPrivateMessage/GroupPrivateMessagePlugin.php +++ b/plugins/GroupPrivateMessage/GroupPrivateMessagePlugin.php @@ -407,7 +407,7 @@ class GroupPrivateMessagePlugin extends Plugin return true; } - function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = array('name' => 'GroupPrivateMessage', 'version' => self::PLUGIN_VERSION, diff --git a/plugins/GroupPrivateMessage/locale/GroupPrivateMessage.pot b/plugins/GroupPrivateMessage/locale/GroupPrivateMessage.pot index 858718ca90..953eb62070 100644 --- a/plugins/GroupPrivateMessage/locale/GroupPrivateMessage.pot +++ b/plugins/GroupPrivateMessage/locale/GroupPrivateMessage.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -211,29 +211,6 @@ msgid "" "%6$s" msgstr "" -#. TRANS: Form legend for sending private message to group %s. -#: forms/groupmessage.php:89 -#, php-format -msgid "Message to %s" -msgstr "" - -#. TRANS: Field label for private group message to group %s. -#: forms/groupmessage.php:128 -#, php-format -msgid "Direct message to %s" -msgstr "" - -#. TRANS: Indicator for number of chatacters still available for notice. -#: forms/groupmessage.php:141 -msgid "Available characters" -msgstr "" - -#. TRANS: Send button text for sending private group notice. -#: forms/groupmessage.php:162 -msgctxt "Send button for sending notice" -msgid "Send" -msgstr "" - #. TRANS: Menu item in group page. #: GroupPrivateMessagePlugin.php:114 msgctxt "MENU" @@ -320,3 +297,26 @@ msgstr "" #: GroupPrivateMessagePlugin.php:418 msgid "Allow posting private messages to groups." msgstr "" + +#. TRANS: Form legend for sending private message to group %s. +#: forms/groupmessage.php:89 +#, php-format +msgid "Message to %s" +msgstr "" + +#. TRANS: Field label for private group message to group %s. +#: forms/groupmessage.php:128 +#, php-format +msgid "Direct message to %s" +msgstr "" + +#. TRANS: Indicator for number of chatacters still available for notice. +#: forms/groupmessage.php:141 +msgid "Available characters" +msgstr "" + +#. TRANS: Send button text for sending private group notice. +#: forms/groupmessage.php:162 +msgctxt "Send button for sending notice" +msgid "Send" +msgstr "" diff --git a/plugins/ImageMagick/ImageMagickPlugin.php b/plugins/ImageMagick/ImageMagickPlugin.php index 1d68a9cb05..622a194574 100644 --- a/plugins/ImageMagick/ImageMagickPlugin.php +++ b/plugins/ImageMagick/ImageMagickPlugin.php @@ -134,7 +134,7 @@ class ImageMagickPlugin extends Plugin return getimagesize($outpath); // Verify that we wrote an understandable image. } - public function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = array('name' => 'ImageMagick', 'version' => self::PLUGIN_VERSION, diff --git a/plugins/ImageMagick/locale/ImageMagick.pot b/plugins/ImageMagick/locale/ImageMagick.pot index e6ba185328..c3e5794b22 100644 --- a/plugins/ImageMagick/locale/ImageMagick.pot +++ b/plugins/ImageMagick/locale/ImageMagick.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/Imap/ImapPlugin.php b/plugins/Imap/ImapPlugin.php index a2da37c2d1..23a079cae0 100644 --- a/plugins/Imap/ImapPlugin.php +++ b/plugins/Imap/ImapPlugin.php @@ -78,7 +78,7 @@ class ImapPlugin extends Plugin $classes[] = new ImapManager($this); } - function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = array('name' => 'IMAP', 'version' => self::PLUGIN_VERSION, diff --git a/plugins/Imap/locale/Imap.pot b/plugins/Imap/locale/Imap.pot index 13da0dd32e..42637bd736 100644 --- a/plugins/Imap/locale/Imap.pot +++ b/plugins/Imap/locale/Imap.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/Imap/locale/sv/LC_MESSAGES/Imap.po b/plugins/Imap/locale/sv/LC_MESSAGES/Imap.po index 245b7d3aa4..b4c37d8e23 100644 --- a/plugins/Imap/locale/sv/LC_MESSAGES/Imap.po +++ b/plugins/Imap/locale/sv/LC_MESSAGES/Imap.po @@ -56,4 +56,4 @@ msgstr "En poll_frequency måste anges." msgid "" "The IMAP plugin allows for StatusNet to check a POP or IMAP mailbox for " "incoming mail containing user posts." -msgstr "IMAP-insticksmodulen gör det möjligt för StatusNet att kontrollera en POP- eller IMAP-brevlåda för inkommande e-post som innehåller användarinlägg." +msgstr "IMAP-instickspluginn gör det möjligt för StatusNet att kontrollera en POP- eller IMAP-brevlåda för inkommande e-post som innehåller användarinlägg." diff --git a/plugins/InProcessCache/InProcessCachePlugin.php b/plugins/InProcessCache/InProcessCachePlugin.php index f108c1dbe9..cb9aba27a0 100644 --- a/plugins/InProcessCache/InProcessCachePlugin.php +++ b/plugins/InProcessCache/InProcessCachePlugin.php @@ -171,7 +171,7 @@ class InProcessCachePlugin extends Plugin * * @return boolean true */ - function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $url = 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/InProcessCache'; diff --git a/plugins/InProcessCache/locale/InProcessCache.pot b/plugins/InProcessCache/locale/InProcessCache.pot index 22bcac275c..809294252f 100644 --- a/plugins/InProcessCache/locale/InProcessCache.pot +++ b/plugins/InProcessCache/locale/InProcessCache.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/InfiniteScroll/InfiniteScrollPlugin.php b/plugins/InfiniteScroll/InfiniteScrollPlugin.php index 904323d387..8478e64b20 100644 --- a/plugins/InfiniteScroll/InfiniteScrollPlugin.php +++ b/plugins/InfiniteScroll/InfiniteScrollPlugin.php @@ -39,7 +39,7 @@ class InfiniteScrollPlugin extends Plugin $action->script($this->path('infinitescroll.js')); } - function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = [ 'name' => 'InfiniteScroll', @@ -47,7 +47,7 @@ class InfiniteScrollPlugin extends Plugin 'author' => 'Craig Andrews', 'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/InfiniteScroll', 'rawdescription' => - // TRANS: Module dscription. + // TRANS: Plugin dscription. _m('Infinite Scroll adds the following functionality to your StatusNet installation: When a user scrolls towards the bottom of the page, the next page of notices is automatically retrieved and appended. This means they never need to click "Next Page", which dramatically increases stickiness.') ]; return true; diff --git a/plugins/InfiniteScroll/locale/InfiniteScroll.pot b/plugins/InfiniteScroll/locale/InfiniteScroll.pot index 6983f94fd2..460a279f89 100644 --- a/plugins/InfiniteScroll/locale/InfiniteScroll.pot +++ b/plugins/InfiniteScroll/locale/InfiniteScroll.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 15:18+0100\n" +"POT-Creation-Date: 2019-08-14 15:20+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,10 +17,10 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#. TRANS: Module dscription. +#. TRANS: Plugin dscription. #: InfiniteScrollPlugin.php:51 msgid "" -"Infinite Scroll adds the following functionality to your StatusNet " +"Infinite Scroll adds the following functionality to your GNU social " "installation: When a user scrolls towards the bottom of the page, the next " "page of notices is automatically retrieved and appended. This means they " "never need to click \"Next Page\", which dramatically increases stickiness." diff --git a/plugins/LRDD/LRDDPlugin.php b/plugins/LRDD/LRDDPlugin.php index 2ae6d96775..f6e0b41570 100644 --- a/plugins/LRDD/LRDDPlugin.php +++ b/plugins/LRDD/LRDDPlugin.php @@ -54,7 +54,7 @@ class LRDDPlugin extends Plugin $disco->registerMethod('LRDDMethod_LinkHTML'); } - public function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = array('name' => 'LRDD', 'version' => self::PLUGIN_VERSION, diff --git a/plugins/LRDD/locale/LRDD.pot b/plugins/LRDD/locale/LRDD.pot index 3db9b1d129..1e25854071 100644 --- a/plugins/LRDD/locale/LRDD.pot +++ b/plugins/LRDD/locale/LRDD.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/LdapAuthentication/LdapAuthenticationPlugin.php b/plugins/LdapAuthentication/LdapAuthenticationPlugin.php index c3e8f305fc..371d6fcf75 100644 --- a/plugins/LdapAuthentication/LdapAuthenticationPlugin.php +++ b/plugins/LdapAuthentication/LdapAuthenticationPlugin.php @@ -143,7 +143,7 @@ class LdapAuthenticationPlugin extends AuthenticationPlugin return common_nicknamize($nickname); } - function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = array('name' => 'LDAP Authentication', 'version' => self::PLUGIN_VERSION, diff --git a/plugins/LdapAuthentication/locale/LdapAuthentication.pot b/plugins/LdapAuthentication/locale/LdapAuthentication.pot index 667d0f7d3f..7a2eefac7c 100644 --- a/plugins/LdapAuthentication/locale/LdapAuthentication.pot +++ b/plugins/LdapAuthentication/locale/LdapAuthentication.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/LdapAuthorization/LdapAuthorizationPlugin.php b/plugins/LdapAuthorization/LdapAuthorizationPlugin.php index 4e6c380610..328d2d3ea5 100644 --- a/plugins/LdapAuthorization/LdapAuthorizationPlugin.php +++ b/plugins/LdapAuthorization/LdapAuthorizationPlugin.php @@ -120,7 +120,7 @@ class LdapAuthorizationPlugin extends AuthorizationPlugin return false; } - function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = array('name' => 'LDAP Authorization', 'version' => self::PLUGIN_VERSION, diff --git a/plugins/LdapAuthorization/locale/LdapAuthorization.pot b/plugins/LdapAuthorization/locale/LdapAuthorization.pot index 96ea96063c..705d2efb71 100644 --- a/plugins/LdapAuthorization/locale/LdapAuthorization.pot +++ b/plugins/LdapAuthorization/locale/LdapAuthorization.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/LdapCommon/locale/LdapCommon.pot b/plugins/LdapCommon/locale/LdapCommon.pot index c9789183bb..77d560702f 100644 --- a/plugins/LdapCommon/locale/LdapCommon.pot +++ b/plugins/LdapCommon/locale/LdapCommon.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/LilUrl/LilUrlPlugin.php b/plugins/LilUrl/LilUrlPlugin.php index 9a5d840caa..e85d9c9c73 100644 --- a/plugins/LilUrl/LilUrlPlugin.php +++ b/plugins/LilUrl/LilUrlPlugin.php @@ -59,7 +59,7 @@ class LilUrlPlugin extends UrlShortenerPlugin } } - function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = array('name' => sprintf('LilUrl (%s)', $this->shortenerName), 'version' => self::PLUGIN_VERSION, diff --git a/plugins/LilUrl/locale/LilUrl.pot b/plugins/LilUrl/locale/LilUrl.pot index 8477b686b9..dd43d9a62b 100644 --- a/plugins/LilUrl/locale/LilUrl.pot +++ b/plugins/LilUrl/locale/LilUrl.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/LinkPreview/LinkPreviewPlugin.php b/plugins/LinkPreview/LinkPreviewPlugin.php index 1e735cab8e..c2b182d043 100644 --- a/plugins/LinkPreview/LinkPreviewPlugin.php +++ b/plugins/LinkPreview/LinkPreviewPlugin.php @@ -31,7 +31,7 @@ class LinkPreviewPlugin extends Plugin { const PLUGIN_VERSION = '2.0.0'; - function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = array('name' => 'LinkPreview', 'version' => self::PLUGIN_VERSION, diff --git a/plugins/LinkPreview/locale/LinkPreview.pot b/plugins/LinkPreview/locale/LinkPreview.pot index b462d0d62c..3aa40a4422 100644 --- a/plugins/LinkPreview/locale/LinkPreview.pot +++ b/plugins/LinkPreview/locale/LinkPreview.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/Linkback/LinkbackPlugin.php b/plugins/Linkback/LinkbackPlugin.php index 212aaca55f..c0cff54c26 100644 --- a/plugins/Linkback/LinkbackPlugin.php +++ b/plugins/Linkback/LinkbackPlugin.php @@ -355,7 +355,7 @@ class LinkbackPlugin extends Plugin return LINKBACKPLUGIN_VERSION; } - function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = array('name' => 'Linkback', 'version' => LINKBACKPLUGIN_VERSION, diff --git a/plugins/Linkback/locale/Linkback.pot b/plugins/Linkback/locale/Linkback.pot index 9bb497a0d9..ffb7fa98f1 100644 --- a/plugins/Linkback/locale/Linkback.pot +++ b/plugins/Linkback/locale/Linkback.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,39 +17,6 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#. TRANS: Trackback title. -#. TRANS: %1$s is a profile nickname, %2$s is a timestamp. -#: LinkbackPlugin.php:318 -#, php-format -msgid "%1$s's status on %2$s" -msgstr "" - -#. TRANS: Plugin description. -#: LinkbackPlugin.php:366 -msgid "" -"Notify blog authors when their posts have been linked in microblog notices " -"using Pingback " -"or Trackback protocols." -msgstr "" - -#. TRANS: OpenID plugin menu item on user settings page. -#: LinkbackPlugin.php:385 -msgctxt "MENU" -msgid "Send Linkbacks" -msgstr "" - -#. TRANS: OpenID plugin tooltip for user settings menu item. -#: LinkbackPlugin.php:387 -msgid "Opt-out of sending linkbacks." -msgstr "" - -#. TRANS: Title. %s is a domain name. -#: LinkbackPlugin.php:412 -#, php-format -msgid "Sent from %s via Linkback" -msgstr "" - #: lib/util.php:211 msgid "linked to this from Pingback " +"or Trackback protocols." +msgstr "" + +#. TRANS: OpenID plugin menu item on user settings page. +#: LinkbackPlugin.php:385 +msgctxt "MENU" +msgid "Send Linkbacks" +msgstr "" + +#. TRANS: OpenID plugin tooltip for user settings menu item. +#: LinkbackPlugin.php:387 +msgid "Opt-out of sending linkbacks." +msgstr "" + +#. TRANS: Title. %s is a domain name. +#: LinkbackPlugin.php:412 +#, php-format +msgid "Sent from %s via Linkback" +msgstr "" diff --git a/plugins/LogFilter/LogFilterPlugin.php b/plugins/LogFilter/LogFilterPlugin.php index bbe06f4a4b..d518b1106b 100644 --- a/plugins/LogFilter/LogFilterPlugin.php +++ b/plugins/LogFilter/LogFilterPlugin.php @@ -41,7 +41,7 @@ class LogFilterPlugin extends Plugin public $priority = array(); // override by priority: array(LOG_ERR => true, LOG_DEBUG => false) public $regex = array(); // override by regex match of message: array('/twitter/i' => false) - function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = array('name' => 'LogFilter', 'version' => self::PLUGIN_VERSION, diff --git a/plugins/LogFilter/locale/LogFilter.pot b/plugins/LogFilter/locale/LogFilter.pot index 4cc528f222..907af08a17 100644 --- a/plugins/LogFilter/locale/LogFilter.pot +++ b/plugins/LogFilter/locale/LogFilter.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/Mapstraction/MapstractionPlugin.php b/plugins/Mapstraction/MapstractionPlugin.php index 80b3900997..cf93af10cb 100644 --- a/plugins/Mapstraction/MapstractionPlugin.php +++ b/plugins/Mapstraction/MapstractionPlugin.php @@ -165,7 +165,7 @@ class MapstractionPlugin extends Plugin $action->elementEnd('div'); } - function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = array('name' => 'Mapstraction', 'version' => self::PLUGIN_VERSION, diff --git a/plugins/Mapstraction/locale/Mapstraction.pot b/plugins/Mapstraction/locale/Mapstraction.pot index 7f6d57a49b..4e278ca563 100644 --- a/plugins/Mapstraction/locale/Mapstraction.pot +++ b/plugins/Mapstraction/locale/Mapstraction.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/Memcached/MemcachedPlugin.php b/plugins/Memcached/MemcachedPlugin.php index 9063117655..2a5d719ef7 100644 --- a/plugins/Memcached/MemcachedPlugin.php +++ b/plugins/Memcached/MemcachedPlugin.php @@ -1,59 +1,62 @@ . /** - * GNU social - a federating social network - * * A plugin to use memcached for the interface with memcache * - * This used to be encoded as config-variable options in the core code; - * it's now broken out to a separate plugin. The same interface can be - * implemented by other plugins. - * - * LICENCE: This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - * * @category Cache * @package GNUsocial * @author Evan Prodromou * @author Craig Andrews * @author Miguel Dantas - * @copyright 2009 StatusNet, Inc. * @copyright 2009, 2019 Free Software Foundation, Inc http://www.fsf.org - * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 - * @link http://status.net/ + * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later */ defined('GNUSOCIAL') || die(); +/** + * A plugin to use memcached for the cache interface + * + * This used to be encoded as config-variable options in the core code; + * it's now broken out to a separate plugin. The same interface can be + * implemented by other plugins. + * + * @copyright 2009, 2019 Free Software Foundation, Inc http://www.fsf.org + * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later + */ class MemcachedPlugin extends Plugin { const PLUGIN_VERSION = '2.1.0'; - static $cacheInitialized = false; + public static $cacheInitialized = false; public $servers = ['127.0.0.1']; public $defaultExpiry = 86400; // 24h - private $_conn = null; + private $_conn = null; /** * Initialize the plugin * * Note that onStartCacheGet() may have been called before this! * - * @return boolean flag value + * @return bool flag value */ - function onInitializePlugin() + public function initialize(): bool { if (self::$cacheInitialized) { $this->persistent = true; @@ -83,12 +86,12 @@ class MemcachedPlugin extends Plugin * * The value should have been set previously. * - * @param string &$key in; Lookup key + * @param string &$key in; Lookup key * @param mixed &$value out; value associated with key * - * @return boolean hook success + * @return bool hook success */ - function onStartCacheGet(&$key, &$value) + public function onStartCacheGet(&$key, &$value): bool { try { $this->_ensureConn(); @@ -108,15 +111,15 @@ class MemcachedPlugin extends Plugin /** * Associate a value with a key * - * @param string &$key in; Key to use for lookups - * @param mixed &$value in; Value to associate - * @param integer &$flag in; Flag empty or Memcached::OPT_COMPRESSION (translated by the `flag` method) - * @param integer &$expiry in; Expiry (passed through to Memcache) - * @param boolean &$success out; Whether the set was successful + * @param string &$key in; Key to use for lookups + * @param mixed &$value in; Value to associate + * @param integer &$flag in; Flag empty or Memcached::OPT_COMPRESSION (translated by the `flag` method) + * @param integer &$expiry in; Expiry (passed through to Memcache) + * @param bool &$success out; Whether the set was successful * - * @return boolean hook success + * @return bool hook success */ - function onStartCacheSet(&$key, &$value, &$flag, &$expiry, &$success) + public function onStartCacheSet(&$key, &$value, &$flag, &$expiry, &$success): bool { if ($expiry === null) { $expiry = $this->defaultExpiry; @@ -138,13 +141,13 @@ class MemcachedPlugin extends Plugin * Atomically increment an existing numeric key value. * Existing expiration time will not be changed. * - * @param string &$key in; Key to use for lookups - * @param int &$step in; Amount to increment (default 1) - * @param mixed &$value out; Incremented value, or false if key not set. + * @param string &$key in; Key to use for lookups + * @param int &$step in; Amount to increment (default 1) + * @param mixed &$value out; Incremented value, or false if key not set. * - * @return boolean hook success + * @return bool hook success */ - function onStartCacheIncrement(&$key, &$step, &$value) + public function onStartCacheIncrement(&$key, &$step, &$value): bool { try { $this->_ensureConn(); @@ -164,12 +167,12 @@ class MemcachedPlugin extends Plugin /** * Delete a value associated with a key * - * @param string &$key in; Key to lookup - * @param boolean &$success out; whether it worked + * @param string &$key in; Key to lookup + * @param bool &$success out; whether it worked * - * @return boolean hook success + * @return bool hook success */ - function onStartCacheDelete(&$key, &$success) + public function onStartCacheDelete(&$key, &$success): bool { try { $this->_ensureConn(); @@ -181,7 +184,11 @@ class MemcachedPlugin extends Plugin return !$success; } - function onStartCacheReconnect(&$success) + /** + * @param $success + * @return bool + */ + public function onStartCacheReconnect(&$success): bool { if (empty($this->_conn)) { // nothing to do @@ -206,7 +213,7 @@ class MemcachedPlugin extends Plugin * * @return void */ - private function _ensureConn() + private function _ensureConn(): void { if (empty($this->_conn)) { $this->_conn = new Memcached(common_config('site', 'nickname')); @@ -243,7 +250,7 @@ class MemcachedPlugin extends Plugin * @param int $flag * @return int */ - protected function flag($flag) + protected function flag(int $flag): int { $out = 0; if ($flag & Cache::COMPRESSED == Cache::COMPRESSED) { @@ -252,15 +259,15 @@ class MemcachedPlugin extends Plugin return $out; } - function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = array('name' => 'Memcached', - 'version' => self::PLUGIN_VERSION, - 'author' => 'Evan Prodromou, Craig Andrews', - 'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/Memcached', - 'description' => - // TRANS: Plugin description. - _m('Use Memcached to cache query results.')); + 'version' => self::PLUGIN_VERSION, + 'author' => 'Evan Prodromou, Craig Andrews', + 'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/Memcached', + 'rawdescription' => + // TRANS: Plugin description. + _m('Use Memcached to cache query results.')); return true; } } diff --git a/plugins/Memcached/locale/Memcached.pot b/plugins/Memcached/locale/Memcached.pot index 4712a32684..e64b215b88 100644 --- a/plugins/Memcached/locale/Memcached.pot +++ b/plugins/Memcached/locale/Memcached.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/MentionURL/MentionURLPlugin.php b/plugins/MentionURL/MentionURLPlugin.php index 182a60076f..83810f46f5 100644 --- a/plugins/MentionURL/MentionURLPlugin.php +++ b/plugins/MentionURL/MentionURLPlugin.php @@ -72,7 +72,7 @@ class MentionURLPlugin extends Plugin return true; } - public function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = array('name' => 'MentionURL', 'version' => self::PLUGIN_VERSION, diff --git a/plugins/MentionURL/locale/MentionURL.pot b/plugins/MentionURL/locale/MentionURL.pot index f5b9cbea32..3493975504 100644 --- a/plugins/MentionURL/locale/MentionURL.pot +++ b/plugins/MentionURL/locale/MentionURL.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/Meteor/MeteorPlugin.php b/plugins/Meteor/MeteorPlugin.php index 432769ef27..a374a76c94 100644 --- a/plugins/Meteor/MeteorPlugin.php +++ b/plugins/Meteor/MeteorPlugin.php @@ -162,7 +162,7 @@ class MeteorPlugin extends RealtimePlugin return implode('-', $path); } - function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = array('name' => 'Meteor', 'version' => self::PLUGIN_VERSION, diff --git a/plugins/Meteor/locale/Meteor.pot b/plugins/Meteor/locale/Meteor.pot index bb5326e5b9..df6a78d6a3 100644 --- a/plugins/Meteor/locale/Meteor.pot +++ b/plugins/Meteor/locale/Meteor.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/MobileProfile/MobileProfilePlugin.php b/plugins/MobileProfile/MobileProfilePlugin.php index 666ca74c00..75b718ed91 100644 --- a/plugins/MobileProfile/MobileProfilePlugin.php +++ b/plugins/MobileProfile/MobileProfilePlugin.php @@ -370,7 +370,7 @@ class MobileProfilePlugin extends WAP20Plugin return $proto.'://'.$serverpart.'/'.$pathpart.$relative; } - function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = array('name' => 'MobileProfile', 'version' => self::PLUGIN_VERSION, diff --git a/plugins/MobileProfile/locale/MobileProfile.pot b/plugins/MobileProfile/locale/MobileProfile.pot index 9411d2962c..0a78e1d6e5 100644 --- a/plugins/MobileProfile/locale/MobileProfile.pot +++ b/plugins/MobileProfile/locale/MobileProfile.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/ModHelper/ModHelperPlugin.php b/plugins/ModHelper/ModHelperPlugin.php index 5be03dfcb4..ce6749c8c8 100644 --- a/plugins/ModHelper/ModHelperPlugin.php +++ b/plugins/ModHelper/ModHelperPlugin.php @@ -29,7 +29,7 @@ class ModHelperPlugin extends Plugin static $rights = array(Right::SILENCEUSER, Right::TRAINSPAM, Right::REVIEWSPAM); - function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = array('name' => 'ModHelper', 'version' => self::PLUGIN_VERSION, diff --git a/plugins/ModHelper/locale/ModHelper.pot b/plugins/ModHelper/locale/ModHelper.pot index f3c3b8b34c..e77954f62b 100644 --- a/plugins/ModHelper/locale/ModHelper.pot +++ b/plugins/ModHelper/locale/ModHelper.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/ModLog/ModLogPlugin.php b/plugins/ModLog/ModLogPlugin.php index 146c9b4b4a..d805dba408 100644 --- a/plugins/ModLog/ModLogPlugin.php +++ b/plugins/ModLog/ModLogPlugin.php @@ -185,7 +185,7 @@ class ModLogPlugin extends Plugin } } - function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = array('name' => 'ModLog', 'version' => self::PLUGIN_VERSION, diff --git a/plugins/ModLog/locale/ModLog.pot b/plugins/ModLog/locale/ModLog.pot index d142952131..349977c88c 100644 --- a/plugins/ModLog/locale/ModLog.pot +++ b/plugins/ModLog/locale/ModLog.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/ModPlus/ModPlusPlugin.php b/plugins/ModPlus/ModPlusPlugin.php index 94a23c0b46..bd06656eb3 100644 --- a/plugins/ModPlus/ModPlusPlugin.php +++ b/plugins/ModPlus/ModPlusPlugin.php @@ -29,7 +29,7 @@ class ModPlusPlugin extends Plugin { const PLUGIN_VERSION = '2.0.0'; - function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = array('name' => 'ModPlus', 'version' => self::PLUGIN_VERSION, diff --git a/plugins/ModPlus/locale/ModPlus.pot b/plugins/ModPlus/locale/ModPlus.pot index 70e7cbfbc0..203abacd94 100644 --- a/plugins/ModPlus/locale/ModPlus.pot +++ b/plugins/ModPlus/locale/ModPlus.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/Mollom/MollomPlugin.php b/plugins/Mollom/MollomPlugin.php index 382ce2ee5b..1a423207f7 100644 --- a/plugins/Mollom/MollomPlugin.php +++ b/plugins/Mollom/MollomPlugin.php @@ -20,7 +20,7 @@ * along with this program. If not, see . * * Mollom is a bayesian spam checker, wrapped into a webservice - * This plugin is based on the Drupal Mollom module + * This plugin is based on the Drupal Mollom Plugin * * @category Plugin * @package Laconica diff --git a/plugins/Mollom/locale/Mollom.pot b/plugins/Mollom/locale/Mollom.pot index 69fa35cf9c..64a59caed5 100644 --- a/plugins/Mollom/locale/Mollom.pot +++ b/plugins/Mollom/locale/Mollom.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/Nodeinfo/locale/Nodeinfo.pot b/plugins/Nodeinfo/locale/Nodeinfo.pot index 759348b664..eb052a0082 100644 --- a/plugins/Nodeinfo/locale/Nodeinfo.pot +++ b/plugins/Nodeinfo/locale/Nodeinfo.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/NoticeTitle/NoticeTitlePlugin.php b/plugins/NoticeTitle/NoticeTitlePlugin.php index 7721c343dd..966e3480d6 100644 --- a/plugins/NoticeTitle/NoticeTitlePlugin.php +++ b/plugins/NoticeTitle/NoticeTitlePlugin.php @@ -84,7 +84,7 @@ class NoticeTitlePlugin extends Plugin * * @return boolean hook value */ - function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $url = 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/NoticeTitle'; diff --git a/plugins/NoticeTitle/locale/NoticeTitle.pot b/plugins/NoticeTitle/locale/NoticeTitle.pot index 51f8f8f194..0694b0178c 100644 --- a/plugins/NoticeTitle/locale/NoticeTitle.pot +++ b/plugins/NoticeTitle/locale/NoticeTitle.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/OStatus/OStatusPlugin.php b/plugins/OStatus/OStatusPlugin.php index 648c8fadd0..5f09a9c89b 100644 --- a/plugins/OStatus/OStatusPlugin.php +++ b/plugins/OStatus/OStatusPlugin.php @@ -1354,7 +1354,7 @@ class OStatusPlugin extends Plugin return true; } - function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = array('name' => 'OStatus', 'version' => self::PLUGIN_VERSION, diff --git a/plugins/OStatus/classes/Magicsig.php b/plugins/OStatus/classes/Magicsig.php index 0a0fd2e067..3e76d47d60 100644 --- a/plugins/OStatus/classes/Magicsig.php +++ b/plugins/OStatus/classes/Magicsig.php @@ -3,7 +3,7 @@ * StatusNet - the distributed open-source microblogging tool * Copyright (C) 2010, StatusNet, Inc. * - * A sample module to show best practices for StatusNet plugins + * A sample plugin to show best practices for StatusNet plugins * * PHP version 5 * @@ -139,7 +139,7 @@ class Magicsig extends Managed_DataObject /** * Generate a new keypair for a local user and store in the database. * - * Warning: this can be very slow on systems without the GMP module. + * Warning: this can be very slow on systems without the GMP plugin. * Runtimes of 20-30 seconds are not unheard-of. * * FIXME: More than 1024 bits please. But StatusNet _discards_ non-1024 bits, diff --git a/plugins/OStatus/lib/magicenvelope.php b/plugins/OStatus/lib/magicenvelope.php index 48b88a2d5f..41a2062492 100644 --- a/plugins/OStatus/lib/magicenvelope.php +++ b/plugins/OStatus/lib/magicenvelope.php @@ -3,7 +3,7 @@ * StatusNet - the distributed open-source microblogging tool * Copyright (C) 2010, StatusNet, Inc. * - * A sample module to show best practices for StatusNet plugins + * A sample plugin to show best practices for StatusNet plugins * * PHP version 5 * diff --git a/plugins/OStatus/lib/salmon.php b/plugins/OStatus/lib/salmon.php index b964538cbc..27aad3a43d 100644 --- a/plugins/OStatus/lib/salmon.php +++ b/plugins/OStatus/lib/salmon.php @@ -3,7 +3,7 @@ * StatusNet - the distributed open-source microblogging tool * Copyright (C) 2010, StatusNet, Inc. * - * A sample module to show best practices for StatusNet plugins + * A sample plugin to show best practices for StatusNet plugins * * PHP version 5 * diff --git a/plugins/OStatus/locale/OStatus.pot b/plugins/OStatus/locale/OStatus.pot index 44aea52b12..0c1e2df49d 100644 --- a/plugins/OStatus/locale/OStatus.pot +++ b/plugins/OStatus/locale/OStatus.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/OfflineBackup/OfflineBackupPlugin.php b/plugins/OfflineBackup/OfflineBackupPlugin.php index 93d4e11dd2..8e9c18b238 100644 --- a/plugins/OfflineBackup/OfflineBackupPlugin.php +++ b/plugins/OfflineBackup/OfflineBackupPlugin.php @@ -72,7 +72,7 @@ class OfflineBackupPlugin extends Plugin return true; } - function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = array('name' => 'OfflineBackup', 'version' => self::PLUGIN_VERSION, diff --git a/plugins/OfflineBackup/locale/OfflineBackup.pot b/plugins/OfflineBackup/locale/OfflineBackup.pot index 74131baaf7..b1e44da3f7 100644 --- a/plugins/OfflineBackup/locale/OfflineBackup.pot +++ b/plugins/OfflineBackup/locale/OfflineBackup.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,11 +17,6 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#. TRANS: Plugin description. -#: OfflineBackupPlugin.php:83 -msgid "Backup user data in offline queue and email when ready." -msgstr "" - #: lib/offlinebackupqueuehandler.php:105 #, php-format msgctxt "" @@ -31,3 +26,8 @@ msgctxt "" "Thanks for your time,\n" msgid "%s\n" msgstr "" + +#. TRANS: Plugin description. +#: OfflineBackupPlugin.php:83 +msgid "Backup user data in offline queue and email when ready." +msgstr "" diff --git a/plugins/OpenExternalLinkTarget/OpenExternalLinkTargetPlugin.php b/plugins/OpenExternalLinkTarget/OpenExternalLinkTargetPlugin.php index a6c8748885..4b2ae5effc 100644 --- a/plugins/OpenExternalLinkTarget/OpenExternalLinkTargetPlugin.php +++ b/plugins/OpenExternalLinkTarget/OpenExternalLinkTargetPlugin.php @@ -51,7 +51,7 @@ class OpenExternalLinkTargetPlugin extends Plugin return true; } - function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = array('name' => 'OpenExternalLinkTarget', 'version' => self::PLUGIN_VERSION, diff --git a/plugins/OpenExternalLinkTarget/locale/OpenExternalLinkTarget.pot b/plugins/OpenExternalLinkTarget/locale/OpenExternalLinkTarget.pot index 1407409d0f..7180a6d65a 100644 --- a/plugins/OpenExternalLinkTarget/locale/OpenExternalLinkTarget.pot +++ b/plugins/OpenExternalLinkTarget/locale/OpenExternalLinkTarget.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/OpenID/OpenIDPlugin.php b/plugins/OpenID/OpenIDPlugin.php index b85ba44c7a..b3c6b44103 100644 --- a/plugins/OpenID/OpenIDPlugin.php +++ b/plugins/OpenID/OpenIDPlugin.php @@ -596,7 +596,7 @@ class OpenIDPlugin extends Plugin * * @return boolean hook value */ - function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = array('name' => 'OpenID', 'version' => self::PLUGIN_VERSION, diff --git a/plugins/OpenID/locale/OpenID.pot b/plugins/OpenID/locale/OpenID.pot index a3aa8b8fa1..a2d5bbabe2 100644 --- a/plugins/OpenID/locale/OpenID.pot +++ b/plugins/OpenID/locale/OpenID.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,6 +17,144 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" +#. TRANS: Client exception thrown when an action is not available. +#: OpenIDPlugin.php:143 +msgid "Unavailable action." +msgstr "" + +#. TRANS: Tooltip for main menu option "Login" +#: OpenIDPlugin.php:192 +msgctxt "TOOLTIP" +msgid "Login to the site." +msgstr "" + +#. TRANS: Main menu option when not logged in to log in +#: OpenIDPlugin.php:195 +msgctxt "MENU" +msgid "Login" +msgstr "" + +#. TRANS: Tooltip for main menu option "Help" +#: OpenIDPlugin.php:200 +msgctxt "TOOLTIP" +msgid "Help me!" +msgstr "" + +#. TRANS: Main menu option for help on the StatusNet site +#: OpenIDPlugin.php:203 +msgctxt "MENU" +msgid "Help" +msgstr "" + +#. TRANS: Tooltip for main menu option "Search" +#: OpenIDPlugin.php:209 +msgctxt "TOOLTIP" +msgid "Search for people or text." +msgstr "" + +#. TRANS: Main menu option when logged in or when the StatusNet instance is not private +#: OpenIDPlugin.php:212 +msgctxt "MENU" +msgid "Search" +msgstr "" + +#. TRANS: OpenID plugin menu item on site logon page. +#. TRANS: OpenID plugin menu item on user settings page. +#. TRANS: OpenID configuration menu item. +#: OpenIDPlugin.php:269 OpenIDPlugin.php:305 OpenIDPlugin.php:479 +#: OpenIDPlugin.php:559 +msgctxt "MENU" +msgid "OpenID" +msgstr "" + +#. TRANS: OpenID plugin tooltip for logon menu item. +#: OpenIDPlugin.php:271 +msgid "Login or register with OpenID." +msgstr "" + +#. TRANS: OpenID plugin tooltip for user settings menu item. +#: OpenIDPlugin.php:307 +msgid "Add or remove OpenIDs." +msgstr "" + +#. TRANS: Page notice for logged in users to try and get them to add an OpenID account to their StatusNet account. +#. TRANS: This message contains Markdown links in the form (description)[link]. +#: OpenIDPlugin.php:421 +#, php-format +msgid "" +"(Have an [OpenID](http://openid.net/)? [Add an OpenID to your account]" +"(%%action.openidsettings%%)!" +msgstr "" + +#. TRANS: Page notice for anonymous users to try and get them to register with an OpenID account. +#. TRANS: This message contains Markdown links in the form (description)[link]. +#: OpenIDPlugin.php:426 +#, php-format +msgid "" +"(Have an [OpenID](http://openid.net/)? Try our [OpenID registration]" +"(%%action.openidlogin%%)!)" +msgstr "" + +#. TRANS: Page notice on the login page to try and get them to log on with an OpenID account. +#. TRANS: This message contains Markdown links in the form (description)[link]. +#: OpenIDPlugin.php:434 +#, php-format +msgid "" +"(Have an [OpenID](http://openid.net/)? Try our [OpenID login](%%action." +"openidlogin%%)!)" +msgstr "" + +#. TRANS: Tooltip for OpenID configuration menu item. +#: OpenIDPlugin.php:561 +msgid "OpenID configuration." +msgstr "" + +#. TRANS: Plugin description. +#: OpenIDPlugin.php:607 +msgid "Use OpenID to login to the site." +msgstr "" + +#. TRANS: button label for OAuth authorization page when needing OpenID authentication first. +#. TRANS: Button text to continue OpenID identity verification. +#: OpenIDPlugin.php:617 actions/openidtrust.php:136 +msgctxt "BUTTON" +msgid "Continue" +msgstr "" + +#. TRANS: OpenID plugin logon form legend. +#: OpenIDPlugin.php:634 actions/openidlogin.php:132 +msgctxt "LEGEND" +msgid "OpenID login" +msgstr "" + +#. TRANS: Field label. +#: OpenIDPlugin.php:642 +msgid "OpenID provider" +msgstr "" + +#. TRANS: Form guide. +#: OpenIDPlugin.php:651 actions/openidlogin.php:149 +msgid "Enter your username." +msgstr "" + +#. TRANS: Form guide. +#: OpenIDPlugin.php:653 actions/openidlogin.php:151 +msgid "You will be sent to the provider's site for authentication." +msgstr "" + +#. TRANS: OpenID plugin logon form field label. +#. TRANS: Field label. +#: OpenIDPlugin.php:657 actions/openidlogin.php:155 +#: actions/openidsettings.php:103 +msgid "OpenID URL" +msgstr "" + +#. TRANS: OpenID plugin logon form field instructions. +#. TRANS: OpenID plugin logon form field title. +#: OpenIDPlugin.php:660 actions/openidlogin.php:158 +msgid "Your OpenID URL." +msgstr "" + #. TRANS: Client error message trying to log on with OpenID while already logged on. #: actions/openidlogin.php:33 actions/finishopenidlogin.php:37 msgid "Already logged in." @@ -44,42 +182,12 @@ msgctxt "TITLE" msgid "OpenID Login" msgstr "" -#. TRANS: OpenID plugin logon form legend. -#: actions/openidlogin.php:132 OpenIDPlugin.php:634 -msgctxt "LEGEND" -msgid "OpenID login" -msgstr "" - #. TRANS: Field label. #: actions/openidlogin.php:140 msgctxt "LABEL" msgid "OpenID provider" msgstr "" -#. TRANS: Form guide. -#: actions/openidlogin.php:149 OpenIDPlugin.php:651 -msgid "Enter your username." -msgstr "" - -#. TRANS: Form guide. -#: actions/openidlogin.php:151 OpenIDPlugin.php:653 -msgid "You will be sent to the provider's site for authentication." -msgstr "" - -#. TRANS: OpenID plugin logon form field label. -#. TRANS: Field label. -#. TRANS: OpenID plugin logon form field label. -#: actions/openidlogin.php:155 actions/openidsettings.php:103 -#: OpenIDPlugin.php:657 -msgid "OpenID URL" -msgstr "" - -#. TRANS: OpenID plugin logon form field title. -#. TRANS: OpenID plugin logon form field instructions. -#: actions/openidlogin.php:158 OpenIDPlugin.php:660 -msgid "Your OpenID URL." -msgstr "" - #. TRANS: OpenID plugin logon form checkbox label for setting to put the OpenID information in a cookie. #: actions/openidlogin.php:163 msgid "Remember me" @@ -318,13 +426,6 @@ msgid "" "and login without creating a new password." msgstr "" -#. TRANS: Button text to continue OpenID identity verification. -#. TRANS: button label for OAuth authorization page when needing OpenID authentication first. -#: actions/openidtrust.php:136 OpenIDPlugin.php:617 -msgctxt "BUTTON" -msgid "Continue" -msgstr "" - #. TRANS: Button text to cancel OpenID identity verification. #: actions/openidtrust.php:138 msgctxt "BUTTON" @@ -568,108 +669,6 @@ msgstr "" msgid "Error connecting user to OpenID." msgstr "" -#. TRANS: Client exception thrown when an action is not available. -#: OpenIDPlugin.php:143 -msgid "Unavailable action." -msgstr "" - -#. TRANS: Tooltip for main menu option "Login" -#: OpenIDPlugin.php:192 -msgctxt "TOOLTIP" -msgid "Login to the site." -msgstr "" - -#. TRANS: Main menu option when not logged in to log in -#: OpenIDPlugin.php:195 -msgctxt "MENU" -msgid "Login" -msgstr "" - -#. TRANS: Tooltip for main menu option "Help" -#: OpenIDPlugin.php:200 -msgctxt "TOOLTIP" -msgid "Help me!" -msgstr "" - -#. TRANS: Main menu option for help on the StatusNet site -#: OpenIDPlugin.php:203 -msgctxt "MENU" -msgid "Help" -msgstr "" - -#. TRANS: Tooltip for main menu option "Search" -#: OpenIDPlugin.php:209 -msgctxt "TOOLTIP" -msgid "Search for people or text." -msgstr "" - -#. TRANS: Main menu option when logged in or when the StatusNet instance is not private -#: OpenIDPlugin.php:212 -msgctxt "MENU" -msgid "Search" -msgstr "" - -#. TRANS: OpenID plugin menu item on site logon page. -#. TRANS: OpenID plugin menu item on user settings page. -#. TRANS: OpenID configuration menu item. -#: OpenIDPlugin.php:269 OpenIDPlugin.php:305 OpenIDPlugin.php:479 -#: OpenIDPlugin.php:559 -msgctxt "MENU" -msgid "OpenID" -msgstr "" - -#. TRANS: OpenID plugin tooltip for logon menu item. -#: OpenIDPlugin.php:271 -msgid "Login or register with OpenID." -msgstr "" - -#. TRANS: OpenID plugin tooltip for user settings menu item. -#: OpenIDPlugin.php:307 -msgid "Add or remove OpenIDs." -msgstr "" - -#. TRANS: Page notice for logged in users to try and get them to add an OpenID account to their StatusNet account. -#. TRANS: This message contains Markdown links in the form (description)[link]. -#: OpenIDPlugin.php:421 -#, php-format -msgid "" -"(Have an [OpenID](http://openid.net/)? [Add an OpenID to your account]" -"(%%action.openidsettings%%)!" -msgstr "" - -#. TRANS: Page notice for anonymous users to try and get them to register with an OpenID account. -#. TRANS: This message contains Markdown links in the form (description)[link]. -#: OpenIDPlugin.php:426 -#, php-format -msgid "" -"(Have an [OpenID](http://openid.net/)? Try our [OpenID registration]" -"(%%action.openidlogin%%)!)" -msgstr "" - -#. TRANS: Page notice on the login page to try and get them to log on with an OpenID account. -#. TRANS: This message contains Markdown links in the form (description)[link]. -#: OpenIDPlugin.php:434 -#, php-format -msgid "" -"(Have an [OpenID](http://openid.net/)? Try our [OpenID login](%%action." -"openidlogin%%)!)" -msgstr "" - -#. TRANS: Tooltip for OpenID configuration menu item. -#: OpenIDPlugin.php:561 -msgid "OpenID configuration." -msgstr "" - -#. TRANS: Plugin description. -#: OpenIDPlugin.php:607 -msgid "Use OpenID to login to the site." -msgstr "" - -#. TRANS: Field label. -#: OpenIDPlugin.php:642 -msgid "OpenID provider" -msgstr "" - #: openid.php:64 msgid "Unknown DB type for OpenID." msgstr "" diff --git a/plugins/OpenID/openid.php b/plugins/OpenID/openid.php index 174357f231..964d098030 100644 --- a/plugins/OpenID/openid.php +++ b/plugins/OpenID/openid.php @@ -262,7 +262,7 @@ function oid_authenticate($openid_url, $returnto, $immediate=false) */ } -// Half-assed attempt at a module-private function +// Half-assed attempt at a Plugin-private function function _oid_print_instructions() { diff --git a/plugins/OpenX/OpenXPlugin.php b/plugins/OpenX/OpenXPlugin.php index b857a7440b..5bcd449018 100644 --- a/plugins/OpenX/OpenXPlugin.php +++ b/plugins/OpenX/OpenXPlugin.php @@ -201,7 +201,7 @@ ENDOFSCRIPT; * * @return boolean hook value */ - function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = array('name' => 'OpenX', 'version' => self::PLUGIN_VERSION, diff --git a/plugins/OpenX/locale/OpenX.pot b/plugins/OpenX/locale/OpenX.pot index 5d2f60b32c..ab51f27438 100644 --- a/plugins/OpenX/locale/OpenX.pot +++ b/plugins/OpenX/locale/OpenX.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,21 +17,6 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#. TRANS: Menu item title. -#: OpenXPlugin.php:189 -msgid "OpenX configuration." -msgstr "" - -#. TRANS: Menu item for site administration -#: OpenXPlugin.php:191 -msgid "OpenX" -msgstr "" - -#. TRANS: Plugin description. -#: OpenXPlugin.php:212 -msgid "Plugin for OpenX Ad Server." -msgstr "" - #. TRANS: Page title for OpenX admin panel. #: actions/openxadminpanel.php:53 msgctxt "TITLE" @@ -103,3 +88,18 @@ msgstr "" #: actions/openxadminpanel.php:220 msgid "Save OpenX settings." msgstr "" + +#. TRANS: Menu item title. +#: OpenXPlugin.php:189 +msgid "OpenX configuration." +msgstr "" + +#. TRANS: Menu item for site administration +#: OpenXPlugin.php:191 +msgid "OpenX" +msgstr "" + +#. TRANS: Plugin description. +#: OpenXPlugin.php:212 +msgid "Plugin for OpenX Ad Server." +msgstr "" diff --git a/plugins/OpenX/locale/fr/LC_MESSAGES/OpenX.po b/plugins/OpenX/locale/fr/LC_MESSAGES/OpenX.po index ec995e7543..0f39ec69ae 100644 --- a/plugins/OpenX/locale/fr/LC_MESSAGES/OpenX.po +++ b/plugins/OpenX/locale/fr/LC_MESSAGES/OpenX.po @@ -30,7 +30,7 @@ msgstr "OpenX" #. TRANS: Plugin description. #: OpenXPlugin.php:210 msgid "Plugin for OpenX Ad Server." -msgstr "Module complémentaire pour le serveur de publicité OpenX." +msgstr "Plugin complémentaire pour le serveur de publicité OpenX." #. TRANS: Page title for OpenX admin panel. #: actions/openxadminpanel.php:53 diff --git a/plugins/OpportunisticQM/OpportunisticQMPlugin.php b/plugins/OpportunisticQM/OpportunisticQMPlugin.php index c8d5a96770..8f42849d9a 100644 --- a/plugins/OpportunisticQM/OpportunisticQMPlugin.php +++ b/plugins/OpportunisticQM/OpportunisticQMPlugin.php @@ -37,7 +37,7 @@ class OpportunisticQMPlugin extends Plugin { return true; } - public function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = array('name' => 'OpportunisticQM', 'version' => self::PLUGIN_VERSION, diff --git a/plugins/OpportunisticQM/locale/OpportunisticQM.pot b/plugins/OpportunisticQM/locale/OpportunisticQM.pot index e83ec425a6..6309a01a65 100644 --- a/plugins/OpportunisticQM/locale/OpportunisticQM.pot +++ b/plugins/OpportunisticQM/locale/OpportunisticQM.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/Orbited/OrbitedPlugin.php b/plugins/Orbited/OrbitedPlugin.php index 2359c02ef8..951a4d7737 100644 --- a/plugins/Orbited/OrbitedPlugin.php +++ b/plugins/Orbited/OrbitedPlugin.php @@ -161,7 +161,7 @@ class OrbitedPlugin extends RealtimePlugin * * @return boolean hook value */ - function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = array('name' => 'Orbited', 'version' => self::PLUGIN_VERSION, diff --git a/plugins/Orbited/locale/Orbited.pot b/plugins/Orbited/locale/Orbited.pot index b2cc0213af..8cabddf235 100644 --- a/plugins/Orbited/locale/Orbited.pot +++ b/plugins/Orbited/locale/Orbited.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/PiwikAnalytics/PiwikAnalyticsPlugin.php b/plugins/PiwikAnalytics/PiwikAnalyticsPlugin.php index 924e36c264..d47752fbdd 100644 --- a/plugins/PiwikAnalytics/PiwikAnalyticsPlugin.php +++ b/plugins/PiwikAnalytics/PiwikAnalyticsPlugin.php @@ -105,7 +105,7 @@ ENDOFPIWIK; return true; } - function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = array('name' => 'PiwikAnalytics', 'version' => self::PLUGIN_VERSION, diff --git a/plugins/PiwikAnalytics/locale/PiwikAnalytics.pot b/plugins/PiwikAnalytics/locale/PiwikAnalytics.pot index 2577691f20..9938b0ecb1 100644 --- a/plugins/PiwikAnalytics/locale/PiwikAnalytics.pot +++ b/plugins/PiwikAnalytics/locale/PiwikAnalytics.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/Poll/PollPlugin.php b/plugins/Poll/PollPlugin.php index 45a7086f0e..070689ecde 100644 --- a/plugins/Poll/PollPlugin.php +++ b/plugins/Poll/PollPlugin.php @@ -121,7 +121,7 @@ class PollPlugin extends MicroAppPlugin * @return bool true hook value * @throws Exception */ - public function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = array('name' => 'Poll', 'version' => self::PLUGIN_VERSION, diff --git a/plugins/Poll/locale/Poll.pot b/plugins/Poll/locale/Poll.pot index 6cf883370a..7fbdc43200 100644 --- a/plugins/Poll/locale/Poll.pot +++ b/plugins/Poll/locale/Poll.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/PostDebug/PostDebugPlugin.php b/plugins/PostDebug/PostDebugPlugin.php index 94c049837f..d8a335870f 100644 --- a/plugins/PostDebug/PostDebugPlugin.php +++ b/plugins/PostDebug/PostDebugPlugin.php @@ -50,7 +50,7 @@ class PostDebugPlugin extends Plugin } } - public function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = array('name' => 'PostDebug', 'version' => self::PLUGIN_VERSION, diff --git a/plugins/PostDebug/locale/PostDebug.pot b/plugins/PostDebug/locale/PostDebug.pot index bafdfda4be..b20ad25afe 100644 --- a/plugins/PostDebug/locale/PostDebug.pot +++ b/plugins/PostDebug/locale/PostDebug.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/PtitUrl/PtitUrlPlugin.php b/plugins/PtitUrl/PtitUrlPlugin.php index a974e914d6..83dccd2048 100644 --- a/plugins/PtitUrl/PtitUrlPlugin.php +++ b/plugins/PtitUrl/PtitUrlPlugin.php @@ -59,7 +59,7 @@ class PtitUrlPlugin extends UrlShortenerPlugin } } - function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = array('name' => sprintf('PtitUrl (%s)', $this->shortenerName), 'version' => self::PLUGIN_VERSION, diff --git a/plugins/PtitUrl/locale/PtitUrl.pot b/plugins/PtitUrl/locale/PtitUrl.pot index d456501d88..45b1c44579 100644 --- a/plugins/PtitUrl/locale/PtitUrl.pot +++ b/plugins/PtitUrl/locale/PtitUrl.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/QnA/QnAPlugin.php b/plugins/QnA/QnAPlugin.php index d9dfc9a02b..37a0a7b333 100644 --- a/plugins/QnA/QnAPlugin.php +++ b/plugins/QnA/QnAPlugin.php @@ -118,7 +118,7 @@ class QnAPlugin extends MicroAppPlugin return true; } - function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = array( 'name' => 'QnA', diff --git a/plugins/QnA/locale/QnA.pot b/plugins/QnA/locale/QnA.pot index 4a21cb85fe..9701d81a9d 100644 --- a/plugins/QnA/locale/QnA.pot +++ b/plugins/QnA/locale/QnA.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/RSSCloud/RSSCloudPlugin.php b/plugins/RSSCloud/RSSCloudPlugin.php index f99054b26d..b6d637e5c2 100644 --- a/plugins/RSSCloud/RSSCloudPlugin.php +++ b/plugins/RSSCloud/RSSCloudPlugin.php @@ -198,7 +198,7 @@ class RSSCloudPlugin extends Plugin return true; } - function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = array('name' => 'RSSCloud', 'version' => RSSCLOUDPLUGIN_VERSION, diff --git a/plugins/RSSCloud/locale/RSSCloud.pot b/plugins/RSSCloud/locale/RSSCloud.pot index 5a152ab9ea..85afb8170d 100644 --- a/plugins/RSSCloud/locale/RSSCloud.pot +++ b/plugins/RSSCloud/locale/RSSCloud.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/Realtime/locale/Realtime.pot b/plugins/Realtime/locale/Realtime.pot index 1cd4d3eefb..8850cb01eb 100644 --- a/plugins/Realtime/locale/Realtime.pot +++ b/plugins/Realtime/locale/Realtime.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/RedisCache/RedisCachePlugin.php b/plugins/RedisCache/RedisCachePlugin.php index 62c5b09c43..317cc1e382 100644 --- a/plugins/RedisCache/RedisCachePlugin.php +++ b/plugins/RedisCache/RedisCachePlugin.php @@ -131,7 +131,7 @@ class RedisCachePlugin extends Plugin return false; } - function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = array('name' => 'RedisCache', 'version' => self::VERSION, diff --git a/plugins/RegisterThrottle/RegisterThrottlePlugin.php b/plugins/RegisterThrottle/RegisterThrottlePlugin.php index 3c8eca4286..6304bfec0d 100644 --- a/plugins/RegisterThrottle/RegisterThrottlePlugin.php +++ b/plugins/RegisterThrottle/RegisterThrottlePlugin.php @@ -238,7 +238,7 @@ class RegisterThrottlePlugin extends Plugin * * @return boolean hook value */ - public function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = array('name' => 'RegisterThrottle', 'version' => self::PLUGIN_VERSION, diff --git a/plugins/RegisterThrottle/locale/RegisterThrottle.pot b/plugins/RegisterThrottle/locale/RegisterThrottle.pot index b5f1781684..bd2483287a 100644 --- a/plugins/RegisterThrottle/locale/RegisterThrottle.pot +++ b/plugins/RegisterThrottle/locale/RegisterThrottle.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php b/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php index aa94c349d0..a4a544784a 100644 --- a/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php +++ b/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php @@ -214,7 +214,7 @@ class RequireValidatedEmailPlugin extends Plugin * * @return boolean hook value */ - function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = array('name' => 'Require Validated Email', diff --git a/plugins/RequireValidatedEmail/locale/RequireValidatedEmail.pot b/plugins/RequireValidatedEmail/locale/RequireValidatedEmail.pot index 84a1505a0f..d22b2d455e 100644 --- a/plugins/RequireValidatedEmail/locale/RequireValidatedEmail.pot +++ b/plugins/RequireValidatedEmail/locale/RequireValidatedEmail.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/ReverseUsernameAuthentication/ReverseUsernameAuthenticationPlugin.php b/plugins/ReverseUsernameAuthentication/ReverseUsernameAuthenticationPlugin.php index f8e75967e0..576f9e9289 100644 --- a/plugins/ReverseUsernameAuthentication/ReverseUsernameAuthenticationPlugin.php +++ b/plugins/ReverseUsernameAuthentication/ReverseUsernameAuthenticationPlugin.php @@ -58,7 +58,7 @@ class ReverseUsernameAuthenticationPlugin extends AuthenticationPlugin return User::register($registration_data); } - function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = array('name' => 'Reverse Username Authentication', 'version' => self::PLUGIN_VERSION, diff --git a/plugins/ReverseUsernameAuthentication/locale/ReverseUsernameAuthentication.pot b/plugins/ReverseUsernameAuthentication/locale/ReverseUsernameAuthentication.pot index 7f4346ff71..10dd6f2031 100644 --- a/plugins/ReverseUsernameAuthentication/locale/ReverseUsernameAuthentication.pot +++ b/plugins/ReverseUsernameAuthentication/locale/ReverseUsernameAuthentication.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/SQLProfile/SQLProfilePlugin.php b/plugins/SQLProfile/SQLProfilePlugin.php index cc3b3e6b14..eb3468d448 100644 --- a/plugins/SQLProfile/SQLProfilePlugin.php +++ b/plugins/SQLProfile/SQLProfilePlugin.php @@ -33,7 +33,7 @@ class SQLProfilePlugin extends Plugin private $recursionGuard = false; - function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = array('name' => 'SQLProfile', 'version' => self::PLUGIN_VERSION, diff --git a/plugins/SQLProfile/locale/SQLProfile.pot b/plugins/SQLProfile/locale/SQLProfile.pot index 506f6e5d7a..bbd2b8f31b 100644 --- a/plugins/SQLProfile/locale/SQLProfile.pot +++ b/plugins/SQLProfile/locale/SQLProfile.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/SQLStats/SQLStatsPlugin.php b/plugins/SQLStats/SQLStatsPlugin.php index 3434e9362b..fdadf0c1bd 100644 --- a/plugins/SQLStats/SQLStatsPlugin.php +++ b/plugins/SQLStats/SQLStatsPlugin.php @@ -36,7 +36,7 @@ class SQLStatsPlugin extends Plugin protected $queryTimes = array(); protected $queries = array(); - function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = array('name' => 'SQLStats', 'version' => self::PLUGIN_VERSION, diff --git a/plugins/SQLStats/locale/SQLStats.pot b/plugins/SQLStats/locale/SQLStats.pot index 4c4bb00aed..2329ed598a 100644 --- a/plugins/SQLStats/locale/SQLStats.pot +++ b/plugins/SQLStats/locale/SQLStats.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/Sample/SamplePlugin.php b/plugins/Sample/SamplePlugin.php index 44cb08260c..6d92694723 100644 --- a/plugins/Sample/SamplePlugin.php +++ b/plugins/Sample/SamplePlugin.php @@ -3,7 +3,7 @@ * StatusNet - the distributed open-source microblogging tool * Copyright (C) 2009, StatusNet, Inc. * - * A sample module to show best practices for StatusNet plugins + * A sample Plugin to show best practices for StatusNet plugins * * PHP version 5 * @@ -87,10 +87,10 @@ if (!defined('STATUSNET')) { * main StatusNet distribution go in 'plugins' and third-party or local ones go * in 'local'. * - * Simple plugins can be implemented as a single module. Others are more complex - * and require additional modules; these should use their own directory, like + * Simple plugins can be implemented as a single Plugin. Others are more complex + * and require additional Plugins; these should use their own directory, like * 'local/plugins/{$name}/'. All files related to the plugin, including images, - * JavaScript, CSS, external libraries or PHP modules should go in the plugin + * JavaScript, CSS, external libraries or PHP Plugins should go in the plugin * directory. * * @category Sample @@ -224,7 +224,7 @@ class SamplePlugin extends Plugin return true; } - function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = array('name' => 'Sample', 'version' => self::PLUGIN_VERSION, diff --git a/plugins/Sample/locale/Sample.pot b/plugins/Sample/locale/Sample.pot index e7c8af9670..153015c034 100644 --- a/plugins/Sample/locale/Sample.pot +++ b/plugins/Sample/locale/Sample.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,22 +18,12 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#. TRANS: Menu item in sample plugin. #. TRANS: Page title for sample plugin. -#: SamplePlugin.php:221 actions/hello.php:112 +#. TRANS: Menu item in sample plugin. +#: actions/hello.php:112 SamplePlugin.php:221 msgid "Hello" msgstr "" -#. TRANS: Menu item title in sample plugin. -#: SamplePlugin.php:223 -msgid "A warm greeting" -msgstr "" - -#. TRANS: Plugin description. -#: SamplePlugin.php:235 -msgid "A sample plugin to show basics of development for new hackers." -msgstr "" - #. TRANS: Page title for sample plugin. %s is a user nickname. #: actions/hello.php:115 #, php-format @@ -73,3 +63,13 @@ msgstr "" #, php-format msgid "Could not increment greeting count for %d." msgstr "" + +#. TRANS: Menu item title in sample plugin. +#: SamplePlugin.php:223 +msgid "A warm greeting" +msgstr "" + +#. TRANS: Plugin description. +#: SamplePlugin.php:235 +msgid "A sample plugin to show basics of development for new hackers." +msgstr "" diff --git a/plugins/SearchSub/SearchSubPlugin.php b/plugins/SearchSub/SearchSubPlugin.php index 546648eb88..dc8db0ab6d 100644 --- a/plugins/SearchSub/SearchSubPlugin.php +++ b/plugins/SearchSub/SearchSubPlugin.php @@ -88,7 +88,7 @@ class SearchSubPlugin extends Plugin * * @return value */ - function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = array('name' => 'SearchSub', 'version' => self::PLUGIN_VERSION, diff --git a/plugins/SearchSub/locale/SearchSub.pot b/plugins/SearchSub/locale/SearchSub.pot index 2855122e32..d0526f60ed 100644 --- a/plugins/SearchSub/locale/SearchSub.pot +++ b/plugins/SearchSub/locale/SearchSub.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,49 +17,6 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#. TRANS: Plugin description. -#: SearchSubPlugin.php:99 -msgid "Plugin to allow following all messages with a given search." -msgstr "" - -#. TRANS: SearchSub plugin menu item on user settings page. -#. TRANS: Sub menu for searches. -#: SearchSubPlugin.php:202 SearchSubPlugin.php:265 -msgctxt "MENU" -msgid "Searches" -msgstr "" - -#. TRANS: SearchSub plugin tooltip for user settings menu item. -#: SearchSubPlugin.php:204 -msgid "Configure search subscriptions" -msgstr "" - -#. TRANS: Help message for IM/SMS command "track " -#: SearchSubPlugin.php:242 -msgctxt "COMMANDHELP" -msgid "Start following notices matching the given search query." -msgstr "" - -#. TRANS: Help message for IM/SMS command "untrack " -#: SearchSubPlugin.php:244 -msgctxt "COMMANDHELP" -msgid "Stop following notices matching the given search query." -msgstr "" - -#. TRANS: Help message for IM/SMS command "track off" -#. TRANS: Help message for IM/SMS command "untrack all" -#: SearchSubPlugin.php:246 SearchSubPlugin.php:248 -msgctxt "COMMANDHELP" -msgid "Disable all tracked search subscriptions." -msgstr "" - -#. TRANS: Help message for IM/SMS command "tracks" -#. TRANS: Help message for IM/SMS command "tracking" -#: SearchSubPlugin.php:250 SearchSubPlugin.php:252 -msgctxt "COMMANDHELP" -msgid "List all your search subscriptions." -msgstr "" - #. TRANS: Error text shown a user tries to untrack a search query they're not subscribed to. #. TRANS: %s is the keyword for the search. #: lib/searchsubuntrackcommand.php:22 @@ -216,6 +173,49 @@ msgstr "" msgid "Unsubscribed" msgstr "" +#. TRANS: Plugin description. +#: SearchSubPlugin.php:99 +msgid "Plugin to allow following all messages with a given search." +msgstr "" + +#. TRANS: SearchSub plugin menu item on user settings page. +#. TRANS: Sub menu for searches. +#: SearchSubPlugin.php:202 SearchSubPlugin.php:265 +msgctxt "MENU" +msgid "Searches" +msgstr "" + +#. TRANS: SearchSub plugin tooltip for user settings menu item. +#: SearchSubPlugin.php:204 +msgid "Configure search subscriptions" +msgstr "" + +#. TRANS: Help message for IM/SMS command "track " +#: SearchSubPlugin.php:242 +msgctxt "COMMANDHELP" +msgid "Start following notices matching the given search query." +msgstr "" + +#. TRANS: Help message for IM/SMS command "untrack " +#: SearchSubPlugin.php:244 +msgctxt "COMMANDHELP" +msgid "Stop following notices matching the given search query." +msgstr "" + +#. TRANS: Help message for IM/SMS command "track off" +#. TRANS: Help message for IM/SMS command "untrack all" +#: SearchSubPlugin.php:246 SearchSubPlugin.php:248 +msgctxt "COMMANDHELP" +msgid "Disable all tracked search subscriptions." +msgstr "" + +#. TRANS: Help message for IM/SMS command "tracks" +#. TRANS: Help message for IM/SMS command "tracking" +#: SearchSubPlugin.php:250 SearchSubPlugin.php:252 +msgctxt "COMMANDHELP" +msgid "List all your search subscriptions." +msgstr "" + #. TRANS: Form legend. #: forms/searchsub.php:110 msgid "Subscribe to this search" diff --git a/plugins/SensitiveContent/SensitiveContentPlugin.php b/plugins/SensitiveContent/SensitiveContentPlugin.php index 25cb7dbf9d..feab0ae6c1 100644 --- a/plugins/SensitiveContent/SensitiveContentPlugin.php +++ b/plugins/SensitiveContent/SensitiveContentPlugin.php @@ -8,7 +8,7 @@ class SensitiveContentPlugin extends Plugin { const PLUGIN_VERSION = '0.0.1'; - function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = array('name' => 'Sensitive Content', 'version' => self::PLUGIN_VERSION, diff --git a/plugins/SensitiveContent/locale/SensitiveContent.pot b/plugins/SensitiveContent/locale/SensitiveContent.pot index 0026e9b54e..ed1f9914af 100644 --- a/plugins/SensitiveContent/locale/SensitiveContent.pot +++ b/plugins/SensitiveContent/locale/SensitiveContent.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/ShareNotice/ShareNoticePlugin.php b/plugins/ShareNotice/ShareNoticePlugin.php index af25f8a6dc..3de48c6fef 100644 --- a/plugins/ShareNotice/ShareNoticePlugin.php +++ b/plugins/ShareNotice/ShareNoticePlugin.php @@ -211,7 +211,7 @@ class FacebookShareTarget extends NoticeShareTarget * * @return boolean hook value */ - function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $url = 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/ShareNotice'; diff --git a/plugins/ShareNotice/locale/ShareNotice.pot b/plugins/ShareNotice/locale/ShareNotice.pot index db2c530c69..2bc180b4b5 100644 --- a/plugins/ShareNotice/locale/ShareNotice.pot +++ b/plugins/ShareNotice/locale/ShareNotice.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/SimpleCaptcha/SimpleCaptchaPlugin.php b/plugins/SimpleCaptcha/SimpleCaptchaPlugin.php index f75beaa12f..cf80b10b50 100644 --- a/plugins/SimpleCaptcha/SimpleCaptchaPlugin.php +++ b/plugins/SimpleCaptcha/SimpleCaptchaPlugin.php @@ -61,7 +61,7 @@ class SimpleCaptchaPlugin extends Plugin return true; } - public function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = array('name' => 'Simple Captcha', 'version' => self::PLUGIN_VERSION, diff --git a/plugins/SimpleCaptcha/locale/SimpleCaptcha.pot b/plugins/SimpleCaptcha/locale/SimpleCaptcha.pot index fb8eabd07f..34bbc5e0b9 100644 --- a/plugins/SimpleCaptcha/locale/SimpleCaptcha.pot +++ b/plugins/SimpleCaptcha/locale/SimpleCaptcha.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/SimpleUrl/SimpleUrlPlugin.php b/plugins/SimpleUrl/SimpleUrlPlugin.php index 65398a86e8..9ce7a63611 100644 --- a/plugins/SimpleUrl/SimpleUrlPlugin.php +++ b/plugins/SimpleUrl/SimpleUrlPlugin.php @@ -49,7 +49,7 @@ class SimpleUrlPlugin extends UrlShortenerPlugin return $this->http_get(sprintf($this->serviceUrl,urlencode($url))); } - function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = array('name' => sprintf('SimpleUrl (%s)', $this->shortenerName), 'version' => self::PLUGIN_VERSION, diff --git a/plugins/SimpleUrl/locale/SimpleUrl.pot b/plugins/SimpleUrl/locale/SimpleUrl.pot index 54cb490404..a80fe74094 100644 --- a/plugins/SimpleUrl/locale/SimpleUrl.pot +++ b/plugins/SimpleUrl/locale/SimpleUrl.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/Sitemap/SitemapPlugin.php b/plugins/Sitemap/SitemapPlugin.php index 059aa40148..1cb70d6509 100644 --- a/plugins/Sitemap/SitemapPlugin.php +++ b/plugins/Sitemap/SitemapPlugin.php @@ -175,7 +175,7 @@ class SitemapPlugin extends Plugin * * @return boolean hook value */ - function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $url = 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/Sitemap'; diff --git a/plugins/Sitemap/locale/Sitemap.pot b/plugins/Sitemap/locale/Sitemap.pot index 6e83286471..2f4c27cae8 100644 --- a/plugins/Sitemap/locale/Sitemap.pot +++ b/plugins/Sitemap/locale/Sitemap.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/SlicedFavorites/SlicedFavoritesPlugin.php b/plugins/SlicedFavorites/SlicedFavoritesPlugin.php index 0d1d05351f..5ce28ca0c1 100644 --- a/plugins/SlicedFavorites/SlicedFavoritesPlugin.php +++ b/plugins/SlicedFavorites/SlicedFavoritesPlugin.php @@ -97,7 +97,7 @@ class SlicedFavoritesPlugin extends Plugin * * @return boolean hook value */ - function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $url = 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/SlicedFavorites'; diff --git a/plugins/SlicedFavorites/locale/SlicedFavorites.pot b/plugins/SlicedFavorites/locale/SlicedFavorites.pot index f31ac56e43..bb8de5c141 100644 --- a/plugins/SlicedFavorites/locale/SlicedFavorites.pot +++ b/plugins/SlicedFavorites/locale/SlicedFavorites.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,12 +17,12 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#. TRANS: Client exception. -#: actions/favoritedslice.php:56 -msgid "Unknown favorites slice." -msgstr "" - #. TRANS: Plugin description. #: SlicedFavoritesPlugin.php:110 msgid "Shows timelines of popular notices for defined subsets of users." msgstr "" + +#. TRANS: Client exception. +#: actions/favoritedslice.php:56 +msgid "Unknown favorites slice." +msgstr "" diff --git a/plugins/SphinxSearch/SphinxSearchPlugin.php b/plugins/SphinxSearch/SphinxSearchPlugin.php index c19fa6a3bf..c451dda98a 100644 --- a/plugins/SphinxSearch/SphinxSearchPlugin.php +++ b/plugins/SphinxSearch/SphinxSearchPlugin.php @@ -107,7 +107,7 @@ class SphinxSearchPlugin extends Plugin * * @return boolean hook value */ - function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $url = 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/SphinxSearch'; diff --git a/plugins/SphinxSearch/locale/SphinxSearch.pot b/plugins/SphinxSearch/locale/SphinxSearch.pot index 4f9ec884ac..a66a004bf5 100644 --- a/plugins/SphinxSearch/locale/SphinxSearch.pot +++ b/plugins/SphinxSearch/locale/SphinxSearch.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,11 +17,6 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#. TRANS: Server exception thrown when a database name cannot be identified. -#: sphinxsearch.php:129 -msgid "Sphinx search could not identify database name." -msgstr "" - #. TRANS: Server exception. #: SphinxSearchPlugin.php:89 msgid "Sphinx PHP extension must be installed." @@ -31,3 +26,8 @@ msgstr "" #: SphinxSearchPlugin.php:120 msgid "Plugin for Sphinx search backend." msgstr "" + +#. TRANS: Server exception thrown when a database name cannot be identified. +#: sphinxsearch.php:129 +msgid "Sphinx search could not identify database name." +msgstr "" diff --git a/plugins/StoreRemoteMedia/StoreRemoteMediaPlugin.php b/plugins/StoreRemoteMedia/StoreRemoteMediaPlugin.php index 7bcb3f3f1b..dad40163c3 100644 --- a/plugins/StoreRemoteMedia/StoreRemoteMediaPlugin.php +++ b/plugins/StoreRemoteMedia/StoreRemoteMediaPlugin.php @@ -209,7 +209,7 @@ class StoreRemoteMediaPlugin extends Plugin return false; } - public function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = array('name' => 'StoreRemoteMedia', 'version' => self::PLUGIN_VERSION, diff --git a/plugins/StoreRemoteMedia/locale/StoreRemoteMedia.pot b/plugins/StoreRemoteMedia/locale/StoreRemoteMedia.pot index 2020ff0424..d4ade78d42 100644 --- a/plugins/StoreRemoteMedia/locale/StoreRemoteMedia.pot +++ b/plugins/StoreRemoteMedia/locale/StoreRemoteMedia.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/StrictTransportSecurity/StrictTransportSecurityPlugin.php b/plugins/StrictTransportSecurity/StrictTransportSecurityPlugin.php index 07047c2778..ff2d9ac71e 100644 --- a/plugins/StrictTransportSecurity/StrictTransportSecurityPlugin.php +++ b/plugins/StrictTransportSecurity/StrictTransportSecurityPlugin.php @@ -52,7 +52,7 @@ class StrictTransportSecurityPlugin extends Plugin } } - function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = array('name' => 'StrictTransportSecurity', 'version' => self::PLUGIN_VERSION, diff --git a/plugins/StrictTransportSecurity/locale/StrictTransportSecurity.pot b/plugins/StrictTransportSecurity/locale/StrictTransportSecurity.pot index 6af7100427..ea0b7ed61b 100644 --- a/plugins/StrictTransportSecurity/locale/StrictTransportSecurity.pot +++ b/plugins/StrictTransportSecurity/locale/StrictTransportSecurity.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/SubMirror/SubMirrorPlugin.php b/plugins/SubMirror/SubMirrorPlugin.php index 2ddfefa9c2..ad60e96c5c 100644 --- a/plugins/SubMirror/SubMirrorPlugin.php +++ b/plugins/SubMirror/SubMirrorPlugin.php @@ -59,7 +59,7 @@ class SubMirrorPlugin extends Plugin } } - function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = array('name' => 'SubMirror', 'version' => self::PLUGIN_VERSION, diff --git a/plugins/SubMirror/locale/SubMirror.pot b/plugins/SubMirror/locale/SubMirror.pot index d0672ee577..3e3b9791a2 100644 --- a/plugins/SubMirror/locale/SubMirror.pot +++ b/plugins/SubMirror/locale/SubMirror.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,27 +17,6 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#. TRANS: Plugin description. -#: SubMirrorPlugin.php:70 -msgid "Pull feeds into your timeline!" -msgstr "" - -#. TRANS: SubMirror plugin menu item on user settings page. -#: SubMirrorPlugin.php:90 -msgctxt "MENU" -msgid "Mirroring" -msgstr "" - -#. TRANS: SubMirror plugin tooltip for user settings menu item. -#: SubMirrorPlugin.php:92 -msgid "Configure mirroring of posts from other feeds" -msgstr "" - -#. TRANS: Label in profile statistics section, followed by a count. -#: SubMirrorPlugin.php:169 -msgid "Mirrored feeds" -msgstr "" - #. TRANS: Name for possible feed provider. #: lib/addmirrorwizard.php:83 msgid "RSS or Atom feed" @@ -118,6 +97,27 @@ msgstr "" msgid "Internal form error: Unrecognized feed provider." msgstr "" +#. TRANS: Plugin description. +#: SubMirrorPlugin.php:70 +msgid "Pull feeds into your timeline!" +msgstr "" + +#. TRANS: SubMirror plugin menu item on user settings page. +#: SubMirrorPlugin.php:90 +msgctxt "MENU" +msgid "Mirroring" +msgstr "" + +#. TRANS: SubMirror plugin tooltip for user settings menu item. +#: SubMirrorPlugin.php:92 +msgid "Configure mirroring of posts from other feeds" +msgstr "" + +#. TRANS: Label in profile statistics section, followed by a count. +#: SubMirrorPlugin.php:169 +msgid "Mirrored feeds" +msgstr "" + #. TRANS: Field label (URL expectected). #: forms/editmirror.php:84 msgctxt "LABEL" diff --git a/plugins/SubscriptionThrottle/SubscriptionThrottlePlugin.php b/plugins/SubscriptionThrottle/SubscriptionThrottlePlugin.php index 256e3dc1c6..797a3c5b6c 100644 --- a/plugins/SubscriptionThrottle/SubscriptionThrottlePlugin.php +++ b/plugins/SubscriptionThrottle/SubscriptionThrottlePlugin.php @@ -159,7 +159,7 @@ class SubscriptionThrottlePlugin extends Plugin * * @return boolean hook value */ - function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = array('name' => 'SubscriptionThrottle', 'version' => self::PLUGIN_VERSION, diff --git a/plugins/SubscriptionThrottle/locale/SubscriptionThrottle.pot b/plugins/SubscriptionThrottle/locale/SubscriptionThrottle.pot index 05c133b169..d7b0607447 100644 --- a/plugins/SubscriptionThrottle/locale/SubscriptionThrottle.pot +++ b/plugins/SubscriptionThrottle/locale/SubscriptionThrottle.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/TabFocus/TabFocusPlugin.php b/plugins/TabFocus/TabFocusPlugin.php index b75e3a85a3..996c1a86c4 100644 --- a/plugins/TabFocus/TabFocusPlugin.php +++ b/plugins/TabFocus/TabFocusPlugin.php @@ -46,7 +46,7 @@ class TabFocusPlugin extends Plugin $action->script($this->path('tabfocus.js')); } - function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = array('name' => 'TabFocus', 'version' => self::PLUGIN_VERSION, diff --git a/plugins/TabFocus/locale/TabFocus.pot b/plugins/TabFocus/locale/TabFocus.pot index edb0d01380..ee0fb06e6d 100644 --- a/plugins/TabFocus/locale/TabFocus.pot +++ b/plugins/TabFocus/locale/TabFocus.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/TagCloud/TagCloudPlugin.php b/plugins/TagCloud/TagCloudPlugin.php index 931e29f898..d896b00ca8 100644 --- a/plugins/TagCloud/TagCloudPlugin.php +++ b/plugins/TagCloud/TagCloudPlugin.php @@ -57,7 +57,7 @@ class TagCloudPlugin extends Plugin { } } - public function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = array('name' => 'TagCloud', 'version' => self::PLUGIN_VERSION, diff --git a/plugins/TagCloud/locale/TagCloud.pot b/plugins/TagCloud/locale/TagCloud.pot index 2a89f8bfd8..c740c82a2d 100644 --- a/plugins/TagCloud/locale/TagCloud.pot +++ b/plugins/TagCloud/locale/TagCloud.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,6 +17,17 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" +#. TRANS: Menu item in search group navigation panel. +#: TagCloudPlugin.php:29 +msgctxt "MENU" +msgid "Recent tags" +msgstr "" + +#. TRANS: Plugin description. +#: TagCloudPlugin.php:68 +msgid "Adds tag clouds to stream pages" +msgstr "" + #. TRANS: Title for personal tag cloud section. #: lib/personaltagcloudsection.php:54 msgctxt "TITLE" @@ -34,14 +45,3 @@ msgstr "" msgctxt "TITLE" msgid "Trends" msgstr "" - -#. TRANS: Menu item in search group navigation panel. -#: TagCloudPlugin.php:29 -msgctxt "MENU" -msgid "Recent tags" -msgstr "" - -#. TRANS: Plugin description. -#: TagCloudPlugin.php:68 -msgid "Adds tag clouds to stream pages" -msgstr "" diff --git a/plugins/TagSub/TagSubPlugin.php b/plugins/TagSub/TagSubPlugin.php index 407e13d3db..3afc6ced4f 100644 --- a/plugins/TagSub/TagSubPlugin.php +++ b/plugins/TagSub/TagSubPlugin.php @@ -91,7 +91,7 @@ class TagSubPlugin extends Plugin * * @return bool true hook value */ - public function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = ['name' => 'TagSub', 'version' => self::PLUGIN_VERSION, diff --git a/plugins/TagSub/locale/TagSub.pot b/plugins/TagSub/locale/TagSub.pot index c17c642323..d6d4e3d2af 100644 --- a/plugins/TagSub/locale/TagSub.pot +++ b/plugins/TagSub/locale/TagSub.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,6 +17,27 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" +#. TRANS: Plugin description. +#: TagSubPlugin.php:102 +msgid "Plugin to allow following all messages with a given tag." +msgstr "" + +#. TRANS: SubMirror plugin menu item on user settings page. +#: TagSubPlugin.php:177 +msgctxt "MENU" +msgid "Tags" +msgstr "" + +#. TRANS: SubMirror plugin tooltip for user settings menu item. +#: TagSubPlugin.php:179 +msgid "Configure tag subscriptions" +msgstr "" + +#. TRANS: Menu item text for tags submenu. +#: TagSubPlugin.php:196 +msgid "Tags" +msgstr "" + #. TRANS: Header for subscriptions overview for a user (first page). #. TRANS: %s is a user nickname. #: actions/tagsubs.php:51 @@ -98,27 +119,6 @@ msgstr "" msgid "Unsubscribed" msgstr "" -#. TRANS: Plugin description. -#: TagSubPlugin.php:102 -msgid "Plugin to allow following all messages with a given tag." -msgstr "" - -#. TRANS: SubMirror plugin menu item on user settings page. -#: TagSubPlugin.php:177 -msgctxt "MENU" -msgid "Tags" -msgstr "" - -#. TRANS: SubMirror plugin tooltip for user settings menu item. -#: TagSubPlugin.php:179 -msgid "Configure tag subscriptions" -msgstr "" - -#. TRANS: Menu item text for tags submenu. -#: TagSubPlugin.php:196 -msgid "Tags" -msgstr "" - #. TRANS: Form legend. #: forms/tagsub.php:109 msgid "Subscribe to this tag" diff --git a/plugins/TightUrl/TightUrlPlugin.php b/plugins/TightUrl/TightUrlPlugin.php index 3134c730aa..d389feb407 100644 --- a/plugins/TightUrl/TightUrlPlugin.php +++ b/plugins/TightUrl/TightUrlPlugin.php @@ -59,7 +59,7 @@ class TightUrlPlugin extends UrlShortenerPlugin } } - function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = array('name' => sprintf('TightUrl (%s)', $this->shortenerName), 'version' => self::PLUGIN_VERSION, diff --git a/plugins/TightUrl/locale/TightUrl.pot b/plugins/TightUrl/locale/TightUrl.pot index ccba88d364..9b8faf21ee 100644 --- a/plugins/TightUrl/locale/TightUrl.pot +++ b/plugins/TightUrl/locale/TightUrl.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/TwitterBridge/TwitterBridgePlugin.php b/plugins/TwitterBridge/TwitterBridgePlugin.php index 79d705c255..b4badeed22 100644 --- a/plugins/TwitterBridge/TwitterBridgePlugin.php +++ b/plugins/TwitterBridge/TwitterBridgePlugin.php @@ -289,7 +289,7 @@ class TwitterBridgePlugin extends Plugin * * @return boolean hook value */ - function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = array( 'name' => 'TwitterBridge', diff --git a/plugins/TwitterBridge/daemons/twitterdaemon.php b/plugins/TwitterBridge/daemons/twitterdaemon.php index 8b774889d1..70d19d642d 100755 --- a/plugins/TwitterBridge/daemons/twitterdaemon.php +++ b/plugins/TwitterBridge/daemons/twitterdaemon.php @@ -211,7 +211,7 @@ class TwitterManager extends IoManager /** * We're ready to process input from one of our data sources! Woooooo! - * @fixme is there an easier way to map from socket back to owning module? :( + * @fixme is there an easier way to map from socket back to owning plugin? :( * * @param resource $socket * @return boolean success diff --git a/plugins/TwitterBridge/locale/TwitterBridge.pot b/plugins/TwitterBridge/locale/TwitterBridge.pot index 96c75f4365..327d8fbb95 100644 --- a/plugins/TwitterBridge/locale/TwitterBridge.pot +++ b/plugins/TwitterBridge/locale/TwitterBridge.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/UserFlag/UserFlagPlugin.php b/plugins/UserFlag/UserFlagPlugin.php index b6464b22de..8fb18616cc 100644 --- a/plugins/UserFlag/UserFlagPlugin.php +++ b/plugins/UserFlag/UserFlagPlugin.php @@ -229,7 +229,7 @@ class UserFlagPlugin extends Plugin * * @return boolean hook value */ - function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $url = 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/UserFlag'; diff --git a/plugins/UserFlag/locale/UserFlag.pot b/plugins/UserFlag/locale/UserFlag.pot index b25a683fd6..1d30563d66 100644 --- a/plugins/UserFlag/locale/UserFlag.pot +++ b/plugins/UserFlag/locale/UserFlag.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/UserLimit/UserLimitPlugin.php b/plugins/UserLimit/UserLimitPlugin.php index b3629af051..37ac69e00b 100644 --- a/plugins/UserLimit/UserLimitPlugin.php +++ b/plugins/UserLimit/UserLimitPlugin.php @@ -83,7 +83,7 @@ class UserLimitPlugin extends Plugin } } - function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = array('name' => 'UserLimit', 'version' => self::PLUGIN_VERSION, diff --git a/plugins/UserLimit/locale/UserLimit.pot b/plugins/UserLimit/locale/UserLimit.pot index a3c83c98b8..bf2146c941 100644 --- a/plugins/UserLimit/locale/UserLimit.pot +++ b/plugins/UserLimit/locale/UserLimit.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/VideoThumbnails/VideoThumbnailsPlugin.php b/plugins/VideoThumbnails/VideoThumbnailsPlugin.php index 1ca49410f1..ae2c00661f 100644 --- a/plugins/VideoThumbnails/VideoThumbnailsPlugin.php +++ b/plugins/VideoThumbnails/VideoThumbnailsPlugin.php @@ -98,7 +98,7 @@ class VideoThumbnailsPlugin extends Plugin return false; } - public function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = array('name' => 'Video Thumbnails', 'version' => self::PLUGIN_VERSION, diff --git a/plugins/VideoThumbnails/locale/VideoThumbnails.pot b/plugins/VideoThumbnails/locale/VideoThumbnails.pot index 5b0dc3421f..39e05fba00 100644 --- a/plugins/VideoThumbnails/locale/VideoThumbnails.pot +++ b/plugins/VideoThumbnails/locale/VideoThumbnails.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/WebFinger/WebFingerPlugin.php b/plugins/WebFinger/WebFingerPlugin.php index 32af193f91..da5ec19b8f 100644 --- a/plugins/WebFinger/WebFingerPlugin.php +++ b/plugins/WebFinger/WebFingerPlugin.php @@ -220,7 +220,7 @@ class WebFingerPlugin extends Plugin } } - public function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = array('name' => 'WebFinger', 'version' => self::PLUGIN_VERSION, diff --git a/plugins/WebFinger/locale/WebFinger.pot b/plugins/WebFinger/locale/WebFinger.pot index 6c2c75db66..089dc1f2cf 100644 --- a/plugins/WebFinger/locale/WebFinger.pot +++ b/plugins/WebFinger/locale/WebFinger.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,12 +17,12 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#. TRANS: Error message when an object URI which we cannot find was requested -#: actions/webfinger.php:49 -msgid "Resource not found in local database." -msgstr "" - #. TRANS: Plugin description. #: WebFingerPlugin.php:230 msgid "Adds WebFinger lookup to GNU Social" msgstr "" + +#. TRANS: Error message when an object URI which we cannot find was requested +#: actions/webfinger.php:49 +msgid "Resource not found in local database." +msgstr "" diff --git a/plugins/WikiHashtags/WikiHashtagsPlugin.php b/plugins/WikiHashtags/WikiHashtagsPlugin.php index 0d0ff2417a..4badc248bc 100644 --- a/plugins/WikiHashtags/WikiHashtagsPlugin.php +++ b/plugins/WikiHashtags/WikiHashtagsPlugin.php @@ -104,7 +104,7 @@ class WikiHashtagsPlugin extends Plugin return true; } - function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = array('name' => 'WikiHashtags', 'version' => self::PLUGIN_VERSION, diff --git a/plugins/WikiHashtags/locale/WikiHashtags.pot b/plugins/WikiHashtags/locale/WikiHashtags.pot index 9ff8038861..036294371c 100644 --- a/plugins/WikiHashtags/locale/WikiHashtags.pot +++ b/plugins/WikiHashtags/locale/WikiHashtags.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/WikiHowProfile/WikiHowProfilePlugin.php b/plugins/WikiHowProfile/WikiHowProfilePlugin.php index a628a6ccee..14bd19a926 100644 --- a/plugins/WikiHowProfile/WikiHowProfilePlugin.php +++ b/plugins/WikiHowProfile/WikiHowProfilePlugin.php @@ -51,7 +51,7 @@ class WikiHowProfilePlugin extends Plugin { const PLUGIN_VERSION = '2.0.0'; - function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = array('name' => 'WikiHow avatar fetcher', 'version' => self::PLUGIN_VERSION, diff --git a/plugins/WikiHowProfile/locale/WikiHowProfile.pot b/plugins/WikiHowProfile/locale/WikiHowProfile.pot index 2966327040..5d0fc18b1d 100644 --- a/plugins/WikiHowProfile/locale/WikiHowProfile.pot +++ b/plugins/WikiHowProfile/locale/WikiHowProfile.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/Xmpp/XmppPlugin.php b/plugins/Xmpp/XmppPlugin.php index 14914a2609..366c1c806c 100644 --- a/plugins/Xmpp/XmppPlugin.php +++ b/plugins/Xmpp/XmppPlugin.php @@ -237,7 +237,7 @@ class XmppPlugin extends ImPlugin } /** - * Load related modules when needed + * Load related Plugins when needed * * @param string $cls Name of the class to be loaded * @@ -440,7 +440,7 @@ class XmppPlugin extends ImPlugin return true; } - function onPluginVersion(array &$versions) + public function onPluginVersion(array &$versions): bool { $versions[] = array('name' => 'XMPP', 'version' => self::PLUGIN_VERSION, diff --git a/plugins/Xmpp/locale/Xmpp.pot b/plugins/Xmpp/locale/Xmpp.pot index 6d6ccc0456..c504de8c47 100644 --- a/plugins/Xmpp/locale/Xmpp.pot +++ b/plugins/Xmpp/locale/Xmpp.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:44+0100\n" +"POT-Creation-Date: 2019-08-14 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,12 +17,6 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#. TRANS: Presence announcement for XMPP. -#. TRANS: Message for XMPP reconnect. -#: lib/xmppmanager.php:90 lib/xmppmanager.php:218 -msgid "Send me a message to post a notice" -msgstr "" - #. TRANS: Plugin display name. #: XmppPlugin.php:65 msgid "XMPP/Jabber" @@ -102,3 +96,9 @@ msgid "" "The XMPP plugin allows users to send and receive notices over the XMPP/" "Jabber network." msgstr "" + +#. TRANS: Presence announcement for XMPP. +#. TRANS: Message for XMPP reconnect. +#: lib/xmppmanager.php:90 lib/xmppmanager.php:218 +msgid "Send me a message to post a notice" +msgstr "" diff --git a/public/index.php b/public/index.php index 38e1546654..59613a4d67 100644 --- a/public/index.php +++ b/public/index.php @@ -333,4 +333,5 @@ main(); // XXX: cleanup exit() calls or add an exit handler so // this always gets called +Event::handle('CleanupModule'); Event::handle('CleanupPlugin'); diff --git a/scripts/docgen.php b/scripts/docgen.php index e8731a7d5a..63bee40630 100755 --- a/scripts/docgen.php +++ b/scripts/docgen.php @@ -59,7 +59,7 @@ if ($plugin) { $indir = INSTALLDIR . "/plugins/" . $plugin; if (!is_dir($indir)) { $indir = INSTALLDIR . "/plugins"; - $filename = "{$plugin}Plugin.php"; + $filename = "{$plugin}Module.php"; if (!file_exists("$indir/$filename")) { echo "Can't find plugin $plugin.\n"; exit(1); diff --git a/scripts/update_po_templates.php b/scripts/update_po_templates.php index c77d7e8a91..0671f0d72a 100755 --- a/scripts/update_po_templates.php +++ b/scripts/update_po_templates.php @@ -54,6 +54,35 @@ END chdir($old); } +function do_update_module($dir, $domain) +{ + $old = getcwd(); + chdir($dir); + if (!file_exists('locale')) { + mkdir('locale'); + } + $files = get_module_sources("."); + $cmd = <<isDir() && !$item->isDot()) { + $name = $item->getBasename(); + if (file_exists("$dir/modules/$name/{$name}Module.php")) { + $plugins[] = $name; + } + } + } + return $plugins; +} + function get_plugins($dir) { $plugins = array(); @@ -98,6 +142,20 @@ function get_plugins($dir) return $plugins; } +function get_module_sources($dir) +{ + $files = array(); + + $dirs = new RecursiveDirectoryIterator($dir); + $iter = new RecursiveIteratorIterator($dirs); + foreach ($iter as $pathname => $item) { + if ($item->isFile() && preg_match('/\.php$/', $item->getBaseName())) { + $files[] = $pathname; + } + } + return $files; +} + function get_plugin_sources($dir) { $files = array(); @@ -112,6 +170,20 @@ function get_plugin_sources($dir) return $files; } +function module_using_gettext($dir) +{ + $files = get_module_sources($dir); + foreach ($files as $pathname) { + // Check if the file is using our _m gettext wrapper + $code = file_get_contents($pathname); + if (preg_match('/\b_m\(/', $code)) { + return true; + } + } + + return false; +} + function plugin_using_gettext($dir) { $files = get_plugin_sources($dir); @@ -126,6 +198,17 @@ function plugin_using_gettext($dir) return false; } +function update_module($basedir, $name) +{ + $dir = "$basedir/modules/$name"; + if (module_using_gettext($dir)) { + do_update_module($dir, $name); + return true; + } else { + return false; + } +} + function update_plugin($basedir, $name) { $dir = "$basedir/plugins/$name"; @@ -142,6 +225,8 @@ array_shift($args); $all = false; $core = false; +$allmodules = false; +$modules = array(); $allplugins = false; $plugins = array(); if (count($args) == 0) { @@ -152,12 +237,16 @@ foreach ($args as $arg) { $all = true; } elseif ($arg == "--core") { $core = true; + } elseif ($arg == "--modules") { + $allmodules = true; } elseif ($arg == "--plugins") { $allplugins = true; + } elseif (substr($arg, 0, 9) == "--module=") { + $modules[] = substr($arg, 9); } elseif (substr($arg, 0, 9) == "--plugin=") { $plugins[] = substr($arg, 9); } elseif ($arg == '--help') { - echo "options: --all --core --plugins --plugin=Foo\n\n"; + echo "options: --all --core --plugins --plugin=Foo --modules --module=Foo\n\n"; exit(0); } } @@ -167,9 +256,22 @@ if ($all || $core) { update_core(INSTALLDIR, 'statusnet'); echo " ok\n"; } +if ($all || $allmodules) { + $plugins = get_modules(INSTALLDIR); +} if ($all || $allplugins) { $plugins = get_plugins(INSTALLDIR); } +if ($modules) { + foreach ($modules as $module) { + echo "$module..."; + if (update_module(INSTALLDIR, $plugin)) { + echo " ok\n"; + } else { + echo " not localized\n"; + } + } +} if ($plugins) { foreach ($plugins as $plugin) { echo "$plugin..."; diff --git a/tests/Core/XmppValidateTest.php b/tests/Core/XmppValidateTest.php index 7cb3e45ae6..62c005e8f0 100644 --- a/tests/Core/XmppValidateTest.php +++ b/tests/Core/XmppValidateTest.php @@ -34,13 +34,13 @@ use PHPUnit\Framework\TestCase; use XmppPlugin; require_once INSTALLDIR . '/lib/common.php'; -require_once INSTALLDIR . '/plugins/Xmpp/XmppPlugin.php'; +require_once INSTALLDIR . '/plugins/Xmpp/XmppModule.php'; final class XmppValidateTest extends TestCase { public function setUp(): void { - if (!array_key_exists('Xmpp', GNUsocial::getActivePlugins())) { + if (!array_key_exists('Xmpp', GNUsocial::getActiveModules())) { $this->markTestSkipped('XmppPlugin is not enabled.'); } }