diff options
| author | dartcafe <github@dartcafe.de> | 2017-11-07 21:51:20 +0300 |
|---|---|---|
| committer | dartcafe <github@dartcafe.de> | 2017-11-07 21:51:20 +0300 |
| commit | a9bdf7d2fcebb5f818620d24bb1ac30ba036f97f (patch) | |
| tree | 8b1b83a418e12bd90b2f5dda7e1b7d6ef278f10c | |
| parent | dea743b43bfb44ae0ac3df184b627f3195a24b79 (diff) | |
| parent | b272a7f778a9b340870dc20f97ff21bffcb39ad5 (diff) | |
Revert "Merge branch 'develop' into votepage-design"
This reverts commit dea743b43bfb44ae0ac3df184b627f3195a24b79, reversing
changes made to 3d5cdbee1f3de0b8e114c7eab199de229569822a.
68 files changed, 217 insertions, 2163 deletions
diff --git a/.editorconfig b/.editorconfig index b71a69eb..1e61cd2f 100644 --- a/.editorconfig +++ b/.editorconfig @@ -20,6 +20,6 @@ trim_trailing_whitespace = true max_line_length = 80 # 2 space indentation for .travis.yml -[.*.yml] +[.travis.yml] indent_style = space indent_size = 2 @@ -1,8 +1,3 @@ -build/ -vendor/ -.project/ +/.project .idea/ -*.lock *.iml -.DS_Store -Thumbs.db diff --git a/.scrutinizer.yml b/.scrutinizer.yml index 4d5f84ad..a546f6e4 100644 --- a/.scrutinizer.yml +++ b/.scrutinizer.yml @@ -1,17 +1,13 @@ filter: - excluded_paths: - - 'l10n/*' - - 'js/vendor/*' + excluded_paths: + - 'l10n/*' + - 'js/vendor/*' imports: - - javascript - - php - -tools: - external_code_coverage: - timeout: 1000 + - javascript + - php build: - tests: - override: - - jshint-run --config js/.jshintrc + tests: + override: + - jshint-run --config js/.jshintrc diff --git a/.scss-lint.yml b/.scss-lint.yml index 01e0396d..958ad170 100644 --- a/.scss-lint.yml +++ b/.scss-lint.yml @@ -1,4 +1,4 @@ build: - tests: - override: - - scss-lint-run /css + tests: + override: + - scss-lint-run /css diff --git a/.travis.yml b/.travis.yml index 01349c8e..a831484b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,50 +11,30 @@ php: - 7.0 - 7.1 -addons: - apt: - packages: - - libxml2-utils - env: global: + - CORE_BRANCH=stable12 - APP_NAME=polls matrix: - - DB=mysql;CLOUD=nextcloud;CORE_BRANCH=stable12 - - DB=sqlite;CLOUD=nextcloud;CORE_BRANCH=stable12 - - DB=pgsql;CLOUD=nextcloud;CORE_BRANCH=stable12 - - DB=mysql;CLOUD=owncloud;CORE_BRANCH=stable10 + - DB=mysql + - DB=sqlite + - DB=pgsql cache: directories: - $HOME/.composer/cache before_install: - # Install NC / oC and app - - if [ $CLOUD = 'nextcloud' ]; then wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh; fi - - if [ $CLOUD = 'owncloud' ]; then wget https://raw.githubusercontent.com/owncloud/administration/master/travis-ci/before_install.sh; fi + - wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh - bash ./before_install.sh $APP_NAME $CORE_BRANCH $DB - - if [ $CLOUD = 'nextcloud' ]; then cd ../server; fi - - if [ $CLOUD = 'owncloud' ]; then cd ../core; fi + - cd ../server - ./occ app:enable $APP_NAME before_script: - cd apps/$APP_NAME script: - # Check info.xml schema validity - - wget https://apps.nextcloud.com/schema/apps/info.xsd - - xmllint appinfo/info.xml --schema info.xsd --noout - - rm info.xsd - # Check PHP syntax errors - - find . -name \*.php -exec php -l "{}" \; - # Execute tests - make test -after_success: - # Generate Code Coverage - - wget https://scrutinizer-ci.com/ocular.phar - - php ocular.phar code-coverage:upload --format=php-clover clover.xml - after_failure: - - cat ../../data/${CLOUD}.log + - cat ../../data/nextcloud.log @@ -129,9 +129,6 @@ else --exclude="css/*.scss" \ ./ $(build_source_directory)/$(app_name) - # We need to replace Nc screenshot urls with the oC ones - sed -i -E "s~(<screenshot>)([^<]*).(png|jpg|jpeg)(</screenshot>)~\1\2-oc.\3\4~" $(build_source_directory)/$(app_name)/appinfo/info.xml - @if [ -f $(oc_cert_directory)/$(app_name).key ]; then \ echo "Creating integrity file..."; \ php ../../occ integrity:sign-app --privateKey="$(oc_cert_directory)/$(app_name).key" --certificate="$(oc_cert_directory)/$(app_name).crt" --path "$(build_source_directory)/$(app_name)"; \ @@ -147,5 +144,5 @@ endif .PHONY: test test: composer - $(CURDIR)/vendor/phpunit/phpunit/phpunit --coverage-clover clover.xml -c phpunit.xml + $(CURDIR)/vendor/phpunit/phpunit/phpunit -c phpunit.xml $(CURDIR)/vendor/phpunit/phpunit/phpunit -c phpunit.integration.xml @@ -1,9 +1,6 @@ # Polls -[](https://travis-ci.org/nextcloud/polls) -[](https://scrutinizer-ci.com/g/nextcloud/polls) -[](https://scrutinizer-ci.com/g/nextcloud/polls) -[](LICENSE) +[](https://travis-ci.org/nextcloud/polls) This is a poll app, similar to doodle or dudle, for Nextcloud / ownCloud written in PHP and JS / jQuery. It is a rework of the already existing [polls app](https://github.com/raduvatav/polls) written by @raduvatav. @@ -19,9 +16,7 @@ It is a rework of the already existing [polls app](https://github.com/raduvatav/ ### Screenshots  -  -  ## Installation / Update diff --git a/appinfo/info.xml b/appinfo/info.xml index e5d735cc..52568b07 100755 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -1,28 +1,23 @@ <?xml version="1.0"?> -<info xmlns:xsi= "http://www.w3.org/2001/XMLSchema-instance" - xsi:noNamespaceSchemaLocation="https://apps.nextcloud.com/schema/apps/info.xsd"> - <id>polls</id> - <name>Polls</name> - <summary>A polls app, similar to doodle/dudle with the possibility to restrict access.</summary> - <description>A polls app, similar to doodle/dudle with the possibility to restrict access (members, certain groups/users, hidden and public).</description> - <version>0.8.0</version> - <licence>agpl</licence> - <author>Vinzenz Rosenkranz</author> - <author>René Gieling</author> - <author>Kai Schröer</author> - <documentation> - <admin>https://github.com/nextcloud/polls/blob/master/README.md</admin> - </documentation> - <category>tools</category> - <website>https://github.com/nextcloud/polls</website> - <bugs>https://github.com/nextcloud/polls/issues</bugs> - <repository type="git">https://github.com/nextcloud/polls.git</repository> - <screenshot>https://raw.githubusercontent.com/nextcloud/polls/master/screenshots/overview.png</screenshot> - <screenshot>https://raw.githubusercontent.com/nextcloud/polls/master/screenshots/vote.png</screenshot> - <screenshot>https://raw.githubusercontent.com/nextcloud/polls/master/screenshots/new-poll.png</screenshot> - <dependencies> - <owncloud min-version="8.2" max-version="10.0" /> - <nextcloud min-version="11" max-version="13" /> - </dependencies> - <ocsid>174671</ocsid> +<info> + <id>polls</id> + <name>Polls</name> + <description>A polls app, similar to doodle/dudle with the possibility to restrict access (members, certain groups/users, hidden and public).</description> + <summary>A polls app, similar to doodle/dudle with the possibility to restrict access.</summary> + <documentation> + <admin>https://github.com/nextcloud/polls/blob/master/README.md</admin> + </documentation> + <screenshot>https://raw.githubusercontent.com/nextcloud/polls/master/screenshots/new-poll.png</screenshot> + <version>0.8.0</version> + <licence>AGPL</licence> + <author>Vinzenz Rosenkranz</author> + <category>tools</category> + <website>https://github.com/nextcloud/polls</website> + <bugs>https://github.com/nextcloud/polls/issues</bugs> + <repository type="git">https://github.com/nextcloud/polls.git</repository> + <dependencies> + <owncloud min-version="8.2" max-version="10.0"/> + <nextcloud min-version="11" max-version="13" /> + </dependencies> + <ocsid>174671</ocsid> </info> diff --git a/composer.json b/composer.json index 6fd16160..6874762b 100644 --- a/composer.json +++ b/composer.json @@ -1,19 +1,14 @@ { "name": "polls", + "description": "This is a poll app, similar to doodle or dudle with the possibility for restrict access (only members, certain groups/users, hidden and public).", "type": "project", - "license": "AGPLv3", + "license": "AGPL", "authors": [ { "name": "Vinzenz Rosenkranz" - }, - { - "name": "Kai Schröer" } ], "require-dev": { - "christophwurst/nextcloud": "^12.0", - "phpunit/phpunit": "^5.4", - "league/factory-muffin": "^3.0", - "league/factory-muffin-faker": "^2.0" + "phpunit/phpunit": "^5.4" } } diff --git a/img/app-logo-polls.svg b/img/app-logo-polls.svg new file mode 100644 index 00000000..136e6590 --- /dev/null +++ b/img/app-logo-polls.svg @@ -0,0 +1,83 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="32" + height="32" + viewBox="0 0 32 32.000001" + id="svg4312" + version="1.1" + inkscape:version="0.91 r13725" + sodipodi:docname="app-logo-polls.svg"> + <defs + id="defs4314" /> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="11.2" + inkscape:cx="38.97017" + inkscape:cy="12.744663" + inkscape:document-units="px" + inkscape:current-layer="layer1" + showgrid="true" + units="px" + inkscape:window-width="1920" + inkscape:window-height="1016" + inkscape:window-x="0" + inkscape:window-y="27" + inkscape:window-maximized="1"> + <inkscape:grid + type="xygrid" + id="grid4320" /> + </sodipodi:namedview> + <metadata + id="metadata4317"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:label="Ebene 1" + inkscape:groupmode="layer" + id="layer1" + transform="translate(0,-1020.3621)"> + <rect + style="fill:#ffffff;fill-opacity:1;stroke:none" + id="rect4345" + width="8" + height="28" + x="2" + y="1022.3621" /> + <rect + style="fill:#ffffff;fill-opacity:1;stroke:none" + id="rect4347" + width="8" + height="18" + x="12" + y="1032.3621" /> + <rect + style="fill:#ffffff;fill-opacity:1;stroke:none" + id="rect4349" + width="8" + height="26" + x="22" + y="1024.3621" /> + </g> +</svg> diff --git a/l10n/da.js b/l10n/da.js deleted file mode 100644 index 32453a61..00000000 --- a/l10n/da.js +++ /dev/null @@ -1,66 +0,0 @@ -OC.L10N.register( - "polls", - { - "Nothing selected!\nClick on cells to turn them green." : "Ingenting valgt\nKlik på en celle for at gøre den grøn.", - "You must enter at least a title for the new poll." : "Du skal indtaste en titel på den nye afstemning.", - "Please select at least one user or group!" : "Vælg venligst mindst en bruger eller gruppe!", - "Do you really want to delete that poll?" : "Er du sikker på du vil slette den afstemning?", - "Copy to clipboard: Ctrl+C, Enter" : "Kopier til udklipsholder: Ctrl+C, Enter", - "You are not registered.\nPlease enter your name to vote\n(at least 3 characters)." : "Du er ikke registreret.\nIndtast dit navn og stem\n(mindst 3 karakterer).", - "Please add some text to your comment before submitting it." : "Tilføj noget tekst til din kommentar for du sender den.", - "An error occurred, your comment was not posted…" : "Der opstod en fejl. Din kommentar blev ikke gemt...", - "Polls" : "Afstemning", - "Hello %s,<br/><br/><strong>%s</strong> participated in the poll '%s'.<br/><br/>To go directly to the poll, you can use this <a href=\"%s\">link</a>" : "Hallo %s,<br/><br/><strong>%s</strong> deltog i afstemningen '%s'.<br/><br/>For at tilgå afstemningen direkte kan du bruge dette <a href=\"%s\">link</a>", - "Polls App - New Comment" : "Polls App - Ny kommentar", - "Polls App" : "Polls App", - "Edit poll" : "Rediger afstemning", - "Create new poll" : "Opret ny afstemning", - "Title" : "Titel", - "Description" : "Beskrivelse", - "Access" : "Adgang", - "Registered users only" : "Kun registrerede brugere", - "hidden" : "skjult", - "Public access" : "Offentlig adgang", - "Select" : "Vælg", - "User/Group search" : "Bruger/gruppe søgning", - "Anonymous" : "Anonym", - "Hide user names for admin" : "Skjul bruger navne for admin", - "Expires" : "Udløber", - "Event schedule" : "Begivenhedstidsplan", - "Text based" : "Tekstbaseret", - "Dates" : "Datoer", - "Text item" : "Tekst", - "Add" : "Tilføj", - "Update poll" : "Opdatér afstemning", - "Create poll" : "Opret afstemning", - "Cancel" : "Annullér", - "No description provided." : "Ingen beskrivelse fundet.", - "Your name here" : "Dit navn her", - "Total" : "Total", - "Best option" : "Bedste valg", - "Vote!" : "Stem!", - "Receive notification email on activity" : "Modtag notifikationsemail om aktivitet", - "Link" : "Link", - "Poll expired" : "Afstemning udløbet", - "The poll expired on %s. Voting is disabled, but you can still comment." : "Afstemningen udløb d. %s. Afstemning er deaktiveret, men du kan stadig kommentere.", - "Comments" : "Kommentarer", - "Login" : "Login", - "or" : "eller", - "Logged in as" : "Logget ind som", - "Send!" : "Send!", - "No comments yet. Be the first." : "Ingen kommentarer endnu. Vær den første.", - "No existing polls." : "Ingen afstemninger eksisterer.", - "By" : "Af", - "Created" : "Oprettet", - "participated" : "deltog", - "You did not vote" : "Du stemte ikke", - "You did not comment" : "Du kommenterede ikke", - "Yourself" : "Dig selv", - "Never" : "Aldrig", - "You voted" : "Du stemte", - "You commented" : "Du kommenterede", - "Click to get link" : "Klik for at få link", - "Access denied" : "Adgang nægtet", - "You are not allowed to view this poll or the poll does not exist." : "Du har ikke tilladelse til at se denne afstemning eller afstemningen eksisterer ikke. " -}, -"nplurals=2; plural=(n != 1);"); diff --git a/l10n/da.json b/l10n/da.json deleted file mode 100644 index fa1d5a0c..00000000 --- a/l10n/da.json +++ /dev/null @@ -1,64 +0,0 @@ -{ "translations": { - "Nothing selected!\nClick on cells to turn them green." : "Ingenting valgt\nKlik på en celle for at gøre den grøn.", - "You must enter at least a title for the new poll." : "Du skal indtaste en titel på den nye afstemning.", - "Please select at least one user or group!" : "Vælg venligst mindst en bruger eller gruppe!", - "Do you really want to delete that poll?" : "Er du sikker på du vil slette den afstemning?", - "Copy to clipboard: Ctrl+C, Enter" : "Kopier til udklipsholder: Ctrl+C, Enter", - "You are not registered.\nPlease enter your name to vote\n(at least 3 characters)." : "Du er ikke registreret.\nIndtast dit navn og stem\n(mindst 3 karakterer).", - "Please add some text to your comment before submitting it." : "Tilføj noget tekst til din kommentar for du sender den.", - "An error occurred, your comment was not posted…" : "Der opstod en fejl. Din kommentar blev ikke gemt...", - "Polls" : "Afstemning", - "Hello %s,<br/><br/><strong>%s</strong> participated in the poll '%s'.<br/><br/>To go directly to the poll, you can use this <a href=\"%s\">link</a>" : "Hallo %s,<br/><br/><strong>%s</strong> deltog i afstemningen '%s'.<br/><br/>For at tilgå afstemningen direkte kan du bruge dette <a href=\"%s\">link</a>", - "Polls App - New Comment" : "Polls App - Ny kommentar", - "Polls App" : "Polls App", - "Edit poll" : "Rediger afstemning", - "Create new poll" : "Opret ny afstemning", - "Title" : "Titel", - "Description" : "Beskrivelse", - "Access" : "Adgang", - "Registered users only" : "Kun registrerede brugere", - "hidden" : "skjult", - "Public access" : "Offentlig adgang", - "Select" : "Vælg", - "User/Group search" : "Bruger/gruppe søgning", - "Anonymous" : "Anonym", - "Hide user names for admin" : "Skjul bruger navne for admin", - "Expires" : "Udløber", - "Event schedule" : "Begivenhedstidsplan", - "Text based" : "Tekstbaseret", - "Dates" : "Datoer", - "Text item" : "Tekst", - "Add" : "Tilføj", - "Update poll" : "Opdatér afstemning", - "Create poll" : "Opret afstemning", - "Cancel" : "Annullér", - "No description provided." : "Ingen beskrivelse fundet.", - "Your name here" : "Dit navn her", - "Total" : "Total", - "Best option" : "Bedste valg", - "Vote!" : "Stem!", - "Receive notification email on activity" : "Modtag notifikationsemail om aktivitet", - "Link" : "Link", - "Poll expired" : "Afstemning udløbet", - "The poll expired on %s. Voting is disabled, but you can still comment." : "Afstemningen udløb d. %s. Afstemning er deaktiveret, men du kan stadig kommentere.", - "Comments" : "Kommentarer", - "Login" : "Login", - "or" : "eller", - "Logged in as" : "Logget ind som", - "Send!" : "Send!", - "No comments yet. Be the first." : "Ingen kommentarer endnu. Vær den første.", - "No existing polls." : "Ingen afstemninger eksisterer.", - "By" : "Af", - "Created" : "Oprettet", - "participated" : "deltog", - "You did not vote" : "Du stemte ikke", - "You did not comment" : "Du kommenterede ikke", - "Yourself" : "Dig selv", - "Never" : "Aldrig", - "You voted" : "Du stemte", - "You commented" : "Du kommenterede", - "Click to get link" : "Klik for at få link", - "Access denied" : "Adgang nægtet", - "You are not allowed to view this poll or the poll does not exist." : "Du har ikke tilladelse til at se denne afstemning eller afstemningen eksisterer ikke. " -},"pluralForm" :"nplurals=2; plural=(n != 1);" -}
\ No newline at end of file diff --git a/l10n/en_GB.js b/l10n/en_GB.js deleted file mode 100644 index e1fe1188..00000000 --- a/l10n/en_GB.js +++ /dev/null @@ -1,66 +0,0 @@ -OC.L10N.register( - "polls", - { - "Nothing selected!\nClick on cells to turn them green." : "Nothing selected!\nClick on cells to turn them green.", - "You must enter at least a title for the new poll." : "You must enter at least a title for the new poll.", - "Please select at least one user or group!" : "Please select at least one user or group!", - "Do you really want to delete that poll?" : "Do you really want to delete that poll?", - "Copy to clipboard: Ctrl+C, Enter" : "Copy to clipboard: Ctrl+C, Enter", - "You are not registered.\nPlease enter your name to vote\n(at least 3 characters)." : "You are not registered.\nPlease enter your name to vote\n(at least 3 characters).", - "Please add some text to your comment before submitting it." : "Please add some text to your comment before submitting it.", - "An error occurred, your comment was not posted…" : "An error occurred, your comment was not posted…", - "Polls" : "Polls", - "Hello %s,<br/><br/><strong>%s</strong> participated in the poll '%s'.<br/><br/>To go directly to the poll, you can use this <a href=\"%s\">link</a>" : "Hello %s,<br/><br/><strong>%s</strong> participated in the poll '%s'.<br/><br/>To go directly to the poll, you can use this <a href=\"%s\">link</a>", - "Polls App - New Comment" : "Polls App - New Comment", - "Polls App" : "Polls App", - "Edit poll" : "Edit poll", - "Create new poll" : "Create new poll", - "Title" : "Title", - "Description" : "Description", - "Access" : "Access", - "Registered users only" : "Registered users only", - "hidden" : "hidden", - "Public access" : "Public access", - "Select" : "Select", - "User/Group search" : "User/Group search", - "Anonymous" : "Anonymous", - "Hide user names for admin" : "Hide user names for admin", - "Expires" : "Expires", - "Event schedule" : "Event schedule", - "Text based" : "Text based", - "Dates" : "Dates", - "Text item" : "Text item", - "Add" : "Add", - "Update poll" : "Update poll", - "Create poll" : "Create poll", - "Cancel" : "Cancel", - "No description provided." : "No description provided.", - "Your name here" : "Your name here", - "Total" : "Total", - "Best option" : "Best option", - "Vote!" : "Vote!", - "Receive notification email on activity" : "Receive notification email on activity", - "Link" : "Link", - "Poll expired" : "Poll expired", - "The poll expired on %s. Voting is disabled, but you can still comment." : "The poll expired on %s. Voting is disabled, but you can still comment.", - "Comments" : "Comments", - "Login" : "Login", - "or" : "or", - "Logged in as" : "Logged in as", - "Send!" : "Send!", - "No comments yet. Be the first." : "No comments yet. Be the first.", - "No existing polls." : "No existing polls.", - "By" : "By", - "Created" : "Created", - "participated" : "participated", - "You did not vote" : "You did not vote", - "You did not comment" : "You did not comment", - "Yourself" : "Yourself", - "Never" : "Never", - "You voted" : "You voted", - "You commented" : "You commented", - "Click to get link" : "Click to get link", - "Access denied" : "Access denied", - "You are not allowed to view this poll or the poll does not exist." : "You are not allowed to view this poll or the poll does not exist." -}, -"nplurals=2; plural=(n != 1);"); diff --git a/l10n/en_GB.json b/l10n/en_GB.json deleted file mode 100644 index 79c16b48..00000000 --- a/l10n/en_GB.json +++ /dev/null @@ -1,64 +0,0 @@ -{ "translations": { - "Nothing selected!\nClick on cells to turn them green." : "Nothing selected!\nClick on cells to turn them green.", - "You must enter at least a title for the new poll." : "You must enter at least a title for the new poll.", - "Please select at least one user or group!" : "Please select at least one user or group!", - "Do you really want to delete that poll?" : "Do you really want to delete that poll?", - "Copy to clipboard: Ctrl+C, Enter" : "Copy to clipboard: Ctrl+C, Enter", - "You are not registered.\nPlease enter your name to vote\n(at least 3 characters)." : "You are not registered.\nPlease enter your name to vote\n(at least 3 characters).", - "Please add some text to your comment before submitting it." : "Please add some text to your comment before submitting it.", - "An error occurred, your comment was not posted…" : "An error occurred, your comment was not posted…", - "Polls" : "Polls", - "Hello %s,<br/><br/><strong>%s</strong> participated in the poll '%s'.<br/><br/>To go directly to the poll, you can use this <a href=\"%s\">link</a>" : "Hello %s,<br/><br/><strong>%s</strong> participated in the poll '%s'.<br/><br/>To go directly to the poll, you can use this <a href=\"%s\">link</a>", - "Polls App - New Comment" : "Polls App - New Comment", - "Polls App" : "Polls App", - "Edit poll" : "Edit poll", - "Create new poll" : "Create new poll", - "Title" : "Title", - "Description" : "Description", - "Access" : "Access", - "Registered users only" : "Registered users only", - "hidden" : "hidden", - "Public access" : "Public access", - "Select" : "Select", - "User/Group search" : "User/Group search", - "Anonymous" : "Anonymous", - "Hide user names for admin" : "Hide user names for admin", - "Expires" : "Expires", - "Event schedule" : "Event schedule", - "Text based" : "Text based", - "Dates" : "Dates", - "Text item" : "Text item", - "Add" : "Add", - "Update poll" : "Update poll", - "Create poll" : "Create poll", - "Cancel" : "Cancel", - "No description provided." : "No description provided.", - "Your name here" : "Your name here", - "Total" : "Total", - "Best option" : "Best option", - "Vote!" : "Vote!", - "Receive notification email on activity" : "Receive notification email on activity", - "Link" : "Link", - "Poll expired" : "Poll expired", - "The poll expired on %s. Voting is disabled, but you can still comment." : "The poll expired on %s. Voting is disabled, but you can still comment.", - "Comments" : "Comments", - "Login" : "Login", - "or" : "or", - "Logged in as" : "Logged in as", - "Send!" : "Send!", - "No comments yet. Be the first." : "No comments yet. Be the first.", - "No existing polls." : "No existing polls.", - "By" : "By", - "Created" : "Created", - "participated" : "participated", - "You did not vote" : "You did not vote", - "You did not comment" : "You did not comment", - "Yourself" : "Yourself", - "Never" : "Never", - "You voted" : "You voted", - "You commented" : "You commented", - "Click to get link" : "Click to get link", - "Access denied" : "Access denied", - "You are not allowed to view this poll or the poll does not exist." : "You are not allowed to view this poll or the poll does not exist." -},"pluralForm" :"nplurals=2; plural=(n != 1);" -}
\ No newline at end of file diff --git a/l10n/es.js b/l10n/es.js deleted file mode 100644 index 270c09f1..00000000 --- a/l10n/es.js +++ /dev/null @@ -1,66 +0,0 @@ -OC.L10N.register( - "polls", - { - "Nothing selected!\nClick on cells to turn them green." : "¡No se ha seleccionado nada!\nClic en las celdas para ponerlas en verde.", - "You must enter at least a title for the new poll." : "Debes introducir al menos un título para la nueva votación.", - "Please select at least one user or group!" : "Por favor, selecciona al menos un usuario o grupo.", - "Do you really want to delete that poll?" : "¿Estás seguro de que quieres eliminar esa votación?", - "Copy to clipboard: Ctrl+C, Enter" : "Copiar al portapapeles: Ctrl-C, Enter", - "You are not registered.\nPlease enter your name to vote\n(at least 3 characters)." : "No estás registrado.\nPor favor, introduce tu nombre para votar\n(al menos, 3 caracteres)", - "Please add some text to your comment before submitting it." : "Por favor, añade algo del texto al comentario antes de enviarlo.", - "An error occurred, your comment was not posted…" : "Ha ocurrido un error, tu comentario no se ha enviado...", - "Polls" : "Votaciones", - "Hello %s,<br/><br/><strong>%s</strong> participated in the poll '%s'.<br/><br/>To go directly to the poll, you can use this <a href=\"%s\">link</a>" : "Hola, %s. <br/><br/><strong>%s</strong> ha participado en la votación '%s's. <br/><br/>Para ir directamente a la votación, puede usar este <a href=\"%s\">enlace</a>", - "Polls App - New Comment" : "App Votaciones - Nuevo comentario", - "Polls App" : "App Votaciones", - "Edit poll" : "Editar votación", - "Create new poll" : "Crear nueva votación", - "Title" : "Título", - "Description" : "Descripción", - "Access" : "Acceso", - "Registered users only" : "Solo usuarios registrados", - "hidden" : "oculta", - "Public access" : "Acceso público", - "Select" : "Seleccionar", - "User/Group search" : "Búsqueda de usuario/grupo", - "Anonymous" : "Anónimo", - "Hide user names for admin" : "Ocultar los nombres de usuario para el administrador", - "Expires" : "Expira", - "Event schedule" : "Programar evento", - "Text based" : "Basada en texto", - "Dates" : "Fechas", - "Text item" : "Ítem de texto", - "Add" : "Añadir", - "Update poll" : "Actualizar votación", - "Create poll" : "Crear votación", - "Cancel" : "Cancelar", - "No description provided." : "No se ha proporcionado descripción.", - "Your name here" : "Tu nombre aquí", - "Total" : "Total", - "Best option" : "Mejor opción", - "Vote!" : "¡Vota!", - "Receive notification email on activity" : "Recibir correo con notificaciones sobre la actividad", - "Link" : "Enlace", - "Poll expired" : "La votación ha caducado", - "The poll expired on %s. Voting is disabled, but you can still comment." : "La votación caducó en %s. No se puede votar, pero todavía puedes comentar.", - "Comments" : "Comentarios", - "Login" : "Iniciar sesión", - "or" : "o", - "Logged in as" : "Registrado como", - "Send!" : "¡Enviar!", - "No comments yet. Be the first." : "Todavía no hay comentarios. Sé el primero.", - "No existing polls." : "No hay votaciones.", - "By" : "Por", - "Created" : "Creada", - "participated" : "participada", - "You did not vote" : "No has votado", - "You did not comment" : "No has comentado", - "Yourself" : "Tú", - "Never" : "Nunca", - "You voted" : "Has votado", - "You commented" : "Has comentado", - "Click to get link" : "Clic para conseguir un enlace", - "Access denied" : "Acceso denegado", - "You are not allowed to view this poll or the poll does not exist." : "No tienes permiso para ver esta votación o la votación no existe." -}, -"nplurals=2; plural=(n != 1);"); diff --git a/l10n/es.json b/l10n/es.json deleted file mode 100644 index 3b31b707..00000000 --- a/l10n/es.json +++ /dev/null @@ -1,64 +0,0 @@ -{ "translations": { - "Nothing selected!\nClick on cells to turn them green." : "¡No se ha seleccionado nada!\nClic en las celdas para ponerlas en verde.", - "You must enter at least a title for the new poll." : "Debes introducir al menos un título para la nueva votación.", - "Please select at least one user or group!" : "Por favor, selecciona al menos un usuario o grupo.", - "Do you really want to delete that poll?" : "¿Estás seguro de que quieres eliminar esa votación?", - "Copy to clipboard: Ctrl+C, Enter" : "Copiar al portapapeles: Ctrl-C, Enter", - "You are not registered.\nPlease enter your name to vote\n(at least 3 characters)." : "No estás registrado.\nPor favor, introduce tu nombre para votar\n(al menos, 3 caracteres)", - "Please add some text to your comment before submitting it." : "Por favor, añade algo del texto al comentario antes de enviarlo.", - "An error occurred, your comment was not posted…" : "Ha ocurrido un error, tu comentario no se ha enviado...", - "Polls" : "Votaciones", - "Hello %s,<br/><br/><strong>%s</strong> participated in the poll '%s'.<br/><br/>To go directly to the poll, you can use this <a href=\"%s\">link</a>" : "Hola, %s. <br/><br/><strong>%s</strong> ha participado en la votación '%s's. <br/><br/>Para ir directamente a la votación, puede usar este <a href=\"%s\">enlace</a>", - "Polls App - New Comment" : "App Votaciones - Nuevo comentario", - "Polls App" : "App Votaciones", - "Edit poll" : "Editar votación", - "Create new poll" : "Crear nueva votación", - "Title" : "Título", - "Description" : "Descripción", - "Access" : "Acceso", - "Registered users only" : "Solo usuarios registrados", - "hidden" : "oculta", - "Public access" : "Acceso público", - "Select" : "Seleccionar", - "User/Group search" : "Búsqueda de usuario/grupo", - "Anonymous" : "Anónimo", - "Hide user names for admin" : "Ocultar los nombres de usuario para el administrador", - "Expires" : "Expira", - "Event schedule" : "Programar evento", - "Text based" : "Basada en texto", - "Dates" : "Fechas", - "Text item" : "Ítem de texto", - "Add" : "Añadir", - "Update poll" : "Actualizar votación", - "Create poll" : "Crear votación", - "Cancel" : "Cancelar", - "No description provided." : "No se ha proporcionado descripción.", - "Your name here" : "Tu nombre aquí", - "Total" : "Total", - "Best option" : "Mejor opción", - "Vote!" : "¡Vota!", - "Receive notification email on activity" : "Recibir correo con notificaciones sobre la actividad", - "Link" : "Enlace", - "Poll expired" : "La votación ha caducado", - "The poll expired on %s. Voting is disabled, but you can still comment." : "La votación caducó en %s. No se puede votar, pero todavía puedes comentar.", - "Comments" : "Comentarios", - "Login" : "Iniciar sesión", - "or" : "o", - "Logged in as" : "Registrado como", - "Send!" : "¡Enviar!", - "No comments yet. Be the first." : "Todavía no hay comentarios. Sé el primero.", - "No existing polls." : "No hay votaciones.", - "By" : "Por", - "Created" : "Creada", - "participated" : "participada", - "You did not vote" : "No has votado", - "You did not comment" : "No has comentado", - "Yourself" : "Tú", - "Never" : "Nunca", - "You voted" : "Has votado", - "You commented" : "Has comentado", - "Click to get link" : "Clic para conseguir un enlace", - "Access denied" : "Acceso denegado", - "You are not allowed to view this poll or the poll does not exist." : "No tienes permiso para ver esta votación o la votación no existe." -},"pluralForm" :"nplurals=2; plural=(n != 1);" -}
\ No newline at end of file diff --git a/l10n/es_CO.js b/l10n/es_CO.js index 58647a8c..a70e4c0d 100644 --- a/l10n/es_CO.js +++ b/l10n/es_CO.js @@ -8,7 +8,6 @@ OC.L10N.register( "Copy to clipboard: Ctrl+C, Enter" : "Copiar a la papelera: Ctrl + C, Enter", "You are not registered.\nPlease enter your name to vote\n(at least 3 characters)." : "No estás registrado.\nPor favor ingresa tu nombre para votar\n(al menos 3 caracteres).", "Please add some text to your comment before submitting it." : "Por favor agrega algo de texto a tu comentario antes de enviarlo. ", - "An error occurred, your comment was not posted…" : "Se presentó un error, tu comentario no fue publicado...", "Polls" : "Encuestas", "Hello %s,<br/><br/><strong>%s</strong> participated in the poll '%s'.<br/><br/>To go directly to the poll, you can use this <a href=\"%s\">link</a>" : "Hola%s,<br/><br/><strong>%s</strong> participó en la encuesta '%s'.<br/><br/> Para ir directamente a la encuesta, puedes usar esta <a href=\"%s\">liga</a>", "Polls App - New Comment" : "Aplicación de encuestas - Nuevo Comentario", @@ -53,12 +52,8 @@ OC.L10N.register( "By" : "Por", "Created" : "Creado", "participated" : "participó", - "You did not vote" : "No votaste", - "You did not comment" : "No dejaste algún comentario", "Yourself" : "Tú mismo", "Never" : "Nunca", - "You voted" : "Votaste", - "You commented" : "Comentaste", "Click to get link" : "Haz click para obtener una liga", "Access denied" : "Acceso denegado", "You are not allowed to view this poll or the poll does not exist." : "No tienes permitido ver esta encuesta o bien la encuesta no existe. " diff --git a/l10n/es_CO.json b/l10n/es_CO.json index 0b86f86e..270ad559 100644 --- a/l10n/es_CO.json +++ b/l10n/es_CO.json @@ -6,7 +6,6 @@ "Copy to clipboard: Ctrl+C, Enter" : "Copiar a la papelera: Ctrl + C, Enter", "You are not registered.\nPlease enter your name to vote\n(at least 3 characters)." : "No estás registrado.\nPor favor ingresa tu nombre para votar\n(al menos 3 caracteres).", "Please add some text to your comment before submitting it." : "Por favor agrega algo de texto a tu comentario antes de enviarlo. ", - "An error occurred, your comment was not posted…" : "Se presentó un error, tu comentario no fue publicado...", "Polls" : "Encuestas", "Hello %s,<br/><br/><strong>%s</strong> participated in the poll '%s'.<br/><br/>To go directly to the poll, you can use this <a href=\"%s\">link</a>" : "Hola%s,<br/><br/><strong>%s</strong> participó en la encuesta '%s'.<br/><br/> Para ir directamente a la encuesta, puedes usar esta <a href=\"%s\">liga</a>", "Polls App - New Comment" : "Aplicación de encuestas - Nuevo Comentario", @@ -51,12 +50,8 @@ "By" : "Por", "Created" : "Creado", "participated" : "participó", - "You did not vote" : "No votaste", - "You did not comment" : "No dejaste algún comentario", "Yourself" : "Tú mismo", "Never" : "Nunca", - "You voted" : "Votaste", - "You commented" : "Comentaste", "Click to get link" : "Haz click para obtener una liga", "Access denied" : "Acceso denegado", "You are not allowed to view this poll or the poll does not exist." : "No tienes permitido ver esta encuesta o bien la encuesta no existe. " diff --git a/l10n/es_CR.js b/l10n/es_CR.js deleted file mode 100644 index 58647a8c..00000000 --- a/l10n/es_CR.js +++ /dev/null @@ -1,66 +0,0 @@ -OC.L10N.register( - "polls", - { - "Nothing selected!\nClick on cells to turn them green." : "¡No haya nada seleccionado!\nHaz click en las celdas para hacerlas verdes. ", - "You must enter at least a title for the new poll." : "Debes ingresar al menos un título para una nueva encuesta. ", - "Please select at least one user or group!" : "¡Por favor selecciona un usuario o grupo!", - "Do you really want to delete that poll?" : "¿Realmente deseas borrar esa encuesta?", - "Copy to clipboard: Ctrl+C, Enter" : "Copiar a la papelera: Ctrl + C, Enter", - "You are not registered.\nPlease enter your name to vote\n(at least 3 characters)." : "No estás registrado.\nPor favor ingresa tu nombre para votar\n(al menos 3 caracteres).", - "Please add some text to your comment before submitting it." : "Por favor agrega algo de texto a tu comentario antes de enviarlo. ", - "An error occurred, your comment was not posted…" : "Se presentó un error, tu comentario no fue publicado...", - "Polls" : "Encuestas", - "Hello %s,<br/><br/><strong>%s</strong> participated in the poll '%s'.<br/><br/>To go directly to the poll, you can use this <a href=\"%s\">link</a>" : "Hola%s,<br/><br/><strong>%s</strong> participó en la encuesta '%s'.<br/><br/> Para ir directamente a la encuesta, puedes usar esta <a href=\"%s\">liga</a>", - "Polls App - New Comment" : "Aplicación de encuestas - Nuevo Comentario", - "Polls App" : "Aplicación para encuestas", - "Edit poll" : "Editar encuesta", - "Create new poll" : "Crear nueva encuesta", - "Title" : "Título", - "Description" : "Descripción", - "Access" : "Acceso", - "Registered users only" : "Solo usuarios registrados", - "hidden" : "oculto", - "Public access" : "Acceso público", - "Select" : "Seleccionar", - "User/Group search" : "Búsqueda de Usuario / Grupo", - "Anonymous" : "Anónimo", - "Hide user names for admin" : "Ocultar los nombres de usuario de admin", - "Expires" : "Expira", - "Event schedule" : "Calendarización del evento", - "Text based" : "Base texto", - "Dates" : "Fechas", - "Text item" : "Siguente elemento", - "Add" : "Agregar", - "Update poll" : "Actualizar encuesta", - "Create poll" : "Crear encuesta", - "Cancel" : "Cancelar", - "No description provided." : "No se proporcionó una descripción. ", - "Your name here" : "Tu nombre aquí", - "Total" : "Total", - "Best option" : "Mejor opción", - "Vote!" : "¡Vota!", - "Receive notification email on activity" : "Recibir un correo de notificación en actividad ", - "Link" : "Liga", - "Poll expired" : "La encuesta expiró", - "The poll expired on %s. Voting is disabled, but you can still comment." : "La encuesta expiró el %s. La votación esta deshabilitada pero aún puedes comentar. ", - "Comments" : "Comentarios", - "Login" : "Iniciar sesión", - "or" : "o", - "Logged in as" : "Sesión iniciada como", - "Send!" : "¡Enviar!", - "No comments yet. Be the first." : "No hay comentarios todavia. Se el primero.", - "No existing polls." : "No hay encuestas existentes.", - "By" : "Por", - "Created" : "Creado", - "participated" : "participó", - "You did not vote" : "No votaste", - "You did not comment" : "No dejaste algún comentario", - "Yourself" : "Tú mismo", - "Never" : "Nunca", - "You voted" : "Votaste", - "You commented" : "Comentaste", - "Click to get link" : "Haz click para obtener una liga", - "Access denied" : "Acceso denegado", - "You are not allowed to view this poll or the poll does not exist." : "No tienes permitido ver esta encuesta o bien la encuesta no existe. " -}, -"nplurals=2; plural=(n != 1);"); diff --git a/l10n/es_CR.json b/l10n/es_CR.json deleted file mode 100644 index 0b86f86e..00000000 --- a/l10n/es_CR.json +++ /dev/null @@ -1,64 +0,0 @@ -{ "translations": { - "Nothing selected!\nClick on cells to turn them green." : "¡No haya nada seleccionado!\nHaz click en las celdas para hacerlas verdes. ", - "You must enter at least a title for the new poll." : "Debes ingresar al menos un título para una nueva encuesta. ", - "Please select at least one user or group!" : "¡Por favor selecciona un usuario o grupo!", - "Do you really want to delete that poll?" : "¿Realmente deseas borrar esa encuesta?", - "Copy to clipboard: Ctrl+C, Enter" : "Copiar a la papelera: Ctrl + C, Enter", - "You are not registered.\nPlease enter your name to vote\n(at least 3 characters)." : "No estás registrado.\nPor favor ingresa tu nombre para votar\n(al menos 3 caracteres).", - "Please add some text to your comment before submitting it." : "Por favor agrega algo de texto a tu comentario antes de enviarlo. ", - "An error occurred, your comment was not posted…" : "Se presentó un error, tu comentario no fue publicado...", - "Polls" : "Encuestas", - "Hello %s,<br/><br/><strong>%s</strong> participated in the poll '%s'.<br/><br/>To go directly to the poll, you can use this <a href=\"%s\">link</a>" : "Hola%s,<br/><br/><strong>%s</strong> participó en la encuesta '%s'.<br/><br/> Para ir directamente a la encuesta, puedes usar esta <a href=\"%s\">liga</a>", - "Polls App - New Comment" : "Aplicación de encuestas - Nuevo Comentario", - "Polls App" : "Aplicación para encuestas", - "Edit poll" : "Editar encuesta", - "Create new poll" : "Crear nueva encuesta", - "Title" : "Título", - "Description" : "Descripción", - "Access" : "Acceso", - "Registered users only" : "Solo usuarios registrados", - "hidden" : "oculto", - "Public access" : "Acceso público", - "Select" : "Seleccionar", - "User/Group search" : "Búsqueda de Usuario / Grupo", - "Anonymous" : "Anónimo", - "Hide user names for admin" : "Ocultar los nombres de usuario de admin", - "Expires" : "Expira", - "Event schedule" : "Calendarización del evento", - "Text based" : "Base texto", - "Dates" : "Fechas", - "Text item" : "Siguente elemento", - "Add" : "Agregar", - "Update poll" : "Actualizar encuesta", - "Create poll" : "Crear encuesta", - "Cancel" : "Cancelar", - "No description provided." : "No se proporcionó una descripción. ", - "Your name here" : "Tu nombre aquí", - "Total" : "Total", - "Best option" : "Mejor opción", - "Vote!" : "¡Vota!", - "Receive notification email on activity" : "Recibir un correo de notificación en actividad ", - "Link" : "Liga", - "Poll expired" : "La encuesta expiró", - "The poll expired on %s. Voting is disabled, but you can still comment." : "La encuesta expiró el %s. La votación esta deshabilitada pero aún puedes comentar. ", - "Comments" : "Comentarios", - "Login" : "Iniciar sesión", - "or" : "o", - "Logged in as" : "Sesión iniciada como", - "Send!" : "¡Enviar!", - "No comments yet. Be the first." : "No hay comentarios todavia. Se el primero.", - "No existing polls." : "No hay encuestas existentes.", - "By" : "Por", - "Created" : "Creado", - "participated" : "participó", - "You did not vote" : "No votaste", - "You did not comment" : "No dejaste algún comentario", - "Yourself" : "Tú mismo", - "Never" : "Nunca", - "You voted" : "Votaste", - "You commented" : "Comentaste", - "Click to get link" : "Haz click para obtener una liga", - "Access denied" : "Acceso denegado", - "You are not allowed to view this poll or the poll does not exist." : "No tienes permitido ver esta encuesta o bien la encuesta no existe. " -},"pluralForm" :"nplurals=2; plural=(n != 1);" -}
\ No newline at end of file diff --git a/l10n/es_DO.js b/l10n/es_DO.js deleted file mode 100644 index 58647a8c..00000000 --- a/l10n/es_DO.js +++ /dev/null @@ -1,66 +0,0 @@ -OC.L10N.register( - "polls", - { - "Nothing selected!\nClick on cells to turn them green." : "¡No haya nada seleccionado!\nHaz click en las celdas para hacerlas verdes. ", - "You must enter at least a title for the new poll." : "Debes ingresar al menos un título para una nueva encuesta. ", - "Please select at least one user or group!" : "¡Por favor selecciona un usuario o grupo!", - "Do you really want to delete that poll?" : "¿Realmente deseas borrar esa encuesta?", - "Copy to clipboard: Ctrl+C, Enter" : "Copiar a la papelera: Ctrl + C, Enter", - "You are not registered.\nPlease enter your name to vote\n(at least 3 characters)." : "No estás registrado.\nPor favor ingresa tu nombre para votar\n(al menos 3 caracteres).", - "Please add some text to your comment before submitting it." : "Por favor agrega algo de texto a tu comentario antes de enviarlo. ", - "An error occurred, your comment was not posted…" : "Se presentó un error, tu comentario no fue publicado...", - "Polls" : "Encuestas", - "Hello %s,<br/><br/><strong>%s</strong> participated in the poll '%s'.<br/><br/>To go directly to the poll, you can use this <a href=\"%s\">link</a>" : "Hola%s,<br/><br/><strong>%s</strong> participó en la encuesta '%s'.<br/><br/> Para ir directamente a la encuesta, puedes usar esta <a href=\"%s\">liga</a>", - "Polls App - New Comment" : "Aplicación de encuestas - Nuevo Comentario", - "Polls App" : "Aplicación para encuestas", - "Edit poll" : "Editar encuesta", - "Create new poll" : "Crear nueva encuesta", - "Title" : "Título", - "Description" : "Descripción", - "Access" : "Acceso", - "Registered users only" : "Solo usuarios registrados", - "hidden" : "oculto", - "Public access" : "Acceso público", - "Select" : "Seleccionar", - "User/Group search" : "Búsqueda de Usuario / Grupo", - "Anonymous" : "Anónimo", - "Hide user names for admin" : "Ocultar los nombres de usuario de admin", - "Expires" : "Expira", - "Event schedule" : "Calendarización del evento", - "Text based" : "Base texto", - "Dates" : "Fechas", - "Text item" : "Siguente elemento", - "Add" : "Agregar", - "Update poll" : "Actualizar encuesta", - "Create poll" : "Crear encuesta", - "Cancel" : "Cancelar", - "No description provided." : "No se proporcionó una descripción. ", - "Your name here" : "Tu nombre aquí", - "Total" : "Total", - "Best option" : "Mejor opción", - "Vote!" : "¡Vota!", - "Receive notification email on activity" : "Recibir un correo de notificación en actividad ", - "Link" : "Liga", - "Poll expired" : "La encuesta expiró", - "The poll expired on %s. Voting is disabled, but you can still comment." : "La encuesta expiró el %s. La votación esta deshabilitada pero aún puedes comentar. ", - "Comments" : "Comentarios", - "Login" : "Iniciar sesión", - "or" : "o", - "Logged in as" : "Sesión iniciada como", - "Send!" : "¡Enviar!", - "No comments yet. Be the first." : "No hay comentarios todavia. Se el primero.", - "No existing polls." : "No hay encuestas existentes.", - "By" : "Por", - "Created" : "Creado", - "participated" : "participó", - "You did not vote" : "No votaste", - "You did not comment" : "No dejaste algún comentario", - "Yourself" : "Tú mismo", - "Never" : "Nunca", - "You voted" : "Votaste", - "You commented" : "Comentaste", - "Click to get link" : "Haz click para obtener una liga", - "Access denied" : "Acceso denegado", - "You are not allowed to view this poll or the poll does not exist." : "No tienes permitido ver esta encuesta o bien la encuesta no existe. " -}, -"nplurals=2; plural=(n != 1);"); diff --git a/l10n/es_DO.json b/l10n/es_DO.json deleted file mode 100644 index 0b86f86e..00000000 --- a/l10n/es_DO.json +++ /dev/null @@ -1,64 +0,0 @@ -{ "translations": { - "Nothing selected!\nClick on cells to turn them green." : "¡No haya nada seleccionado!\nHaz click en las celdas para hacerlas verdes. ", - "You must enter at least a title for the new poll." : "Debes ingresar al menos un título para una nueva encuesta. ", - "Please select at least one user or group!" : "¡Por favor selecciona un usuario o grupo!", - "Do you really want to delete that poll?" : "¿Realmente deseas borrar esa encuesta?", - "Copy to clipboard: Ctrl+C, Enter" : "Copiar a la papelera: Ctrl + C, Enter", - "You are not registered.\nPlease enter your name to vote\n(at least 3 characters)." : "No estás registrado.\nPor favor ingresa tu nombre para votar\n(al menos 3 caracteres).", - "Please add some text to your comment before submitting it." : "Por favor agrega algo de texto a tu comentario antes de enviarlo. ", - "An error occurred, your comment was not posted…" : "Se presentó un error, tu comentario no fue publicado...", - "Polls" : "Encuestas", - "Hello %s,<br/><br/><strong>%s</strong> participated in the poll '%s'.<br/><br/>To go directly to the poll, you can use this <a href=\"%s\">link</a>" : "Hola%s,<br/><br/><strong>%s</strong> participó en la encuesta '%s'.<br/><br/> Para ir directamente a la encuesta, puedes usar esta <a href=\"%s\">liga</a>", - "Polls App - New Comment" : "Aplicación de encuestas - Nuevo Comentario", - "Polls App" : "Aplicación para encuestas", - "Edit poll" : "Editar encuesta", - "Create new poll" : "Crear nueva encuesta", - "Title" : "Título", - "Description" : "Descripción", - "Access" : "Acceso", - "Registered users only" : "Solo usuarios registrados", - "hidden" : "oculto", - "Public access" : "Acceso público", - "Select" : "Seleccionar", - "User/Group search" : "Búsqueda de Usuario / Grupo", - "Anonymous" : "Anónimo", - "Hide user names for admin" : "Ocultar los nombres de usuario de admin", - "Expires" : "Expira", - "Event schedule" : "Calendarización del evento", - "Text based" : "Base texto", - "Dates" : "Fechas", - "Text item" : "Siguente elemento", - "Add" : "Agregar", - "Update poll" : "Actualizar encuesta", - "Create poll" : "Crear encuesta", - "Cancel" : "Cancelar", - "No description provided." : "No se proporcionó una descripción. ", - "Your name here" : "Tu nombre aquí", - "Total" : "Total", - "Best option" : "Mejor opción", - "Vote!" : "¡Vota!", - "Receive notification email on activity" : "Recibir un correo de notificación en actividad ", - "Link" : "Liga", - "Poll expired" : "La encuesta expiró", - "The poll expired on %s. Voting is disabled, but you can still comment." : "La encuesta expiró el %s. La votación esta deshabilitada pero aún puedes comentar. ", - "Comments" : "Comentarios", - "Login" : "Iniciar sesión", - "or" : "o", - "Logged in as" : "Sesión iniciada como", - "Send!" : "¡Enviar!", - "No comments yet. Be the first." : "No hay comentarios todavia. Se el primero.", - "No existing polls." : "No hay encuestas existentes.", - "By" : "Por", - "Created" : "Creado", - "participated" : "participó", - "You did not vote" : "No votaste", - "You did not comment" : "No dejaste algún comentario", - "Yourself" : "Tú mismo", - "Never" : "Nunca", - "You voted" : "Votaste", - "You commented" : "Comentaste", - "Click to get link" : "Haz click para obtener una liga", - "Access denied" : "Acceso denegado", - "You are not allowed to view this poll or the poll does not exist." : "No tienes permitido ver esta encuesta o bien la encuesta no existe. " -},"pluralForm" :"nplurals=2; plural=(n != 1);" -}
\ No newline at end of file diff --git a/l10n/es_EC.js b/l10n/es_EC.js deleted file mode 100644 index 58647a8c..00000000 --- a/l10n/es_EC.js +++ /dev/null @@ -1,66 +0,0 @@ -OC.L10N.register( - "polls", - { - "Nothing selected!\nClick on cells to turn them green." : "¡No haya nada seleccionado!\nHaz click en las celdas para hacerlas verdes. ", - "You must enter at least a title for the new poll." : "Debes ingresar al menos un título para una nueva encuesta. ", - "Please select at least one user or group!" : "¡Por favor selecciona un usuario o grupo!", - "Do you really want to delete that poll?" : "¿Realmente deseas borrar esa encuesta?", - "Copy to clipboard: Ctrl+C, Enter" : "Copiar a la papelera: Ctrl + C, Enter", - "You are not registered.\nPlease enter your name to vote\n(at least 3 characters)." : "No estás registrado.\nPor favor ingresa tu nombre para votar\n(al menos 3 caracteres).", - "Please add some text to your comment before submitting it." : "Por favor agrega algo de texto a tu comentario antes de enviarlo. ", - "An error occurred, your comment was not posted…" : "Se presentó un error, tu comentario no fue publicado...", - "Polls" : "Encuestas", - "Hello %s,<br/><br/><strong>%s</strong> participated in the poll '%s'.<br/><br/>To go directly to the poll, you can use this <a href=\"%s\">link</a>" : "Hola%s,<br/><br/><strong>%s</strong> participó en la encuesta '%s'.<br/><br/> Para ir directamente a la encuesta, puedes usar esta <a href=\"%s\">liga</a>", - "Polls App - New Comment" : "Aplicación de encuestas - Nuevo Comentario", - "Polls App" : "Aplicación para encuestas", - "Edit poll" : "Editar encuesta", - "Create new poll" : "Crear nueva encuesta", - "Title" : "Título", - "Description" : "Descripción", - "Access" : "Acceso", - "Registered users only" : "Solo usuarios registrados", - "hidden" : "oculto", - "Public access" : "Acceso público", - "Select" : "Seleccionar", - "User/Group search" : "Búsqueda de Usuario / Grupo", - "Anonymous" : "Anónimo", - "Hide user names for admin" : "Ocultar los nombres de usuario de admin", - "Expires" : "Expira", - "Event schedule" : "Calendarización del evento", - "Text based" : "Base texto", - "Dates" : "Fechas", - "Text item" : "Siguente elemento", - "Add" : "Agregar", - "Update poll" : "Actualizar encuesta", - "Create poll" : "Crear encuesta", - "Cancel" : "Cancelar", - "No description provided." : "No se proporcionó una descripción. ", - "Your name here" : "Tu nombre aquí", - "Total" : "Total", - "Best option" : "Mejor opción", - "Vote!" : "¡Vota!", - "Receive notification email on activity" : "Recibir un correo de notificación en actividad ", - "Link" : "Liga", - "Poll expired" : "La encuesta expiró", - "The poll expired on %s. Voting is disabled, but you can still comment." : "La encuesta expiró el %s. La votación esta deshabilitada pero aún puedes comentar. ", - "Comments" : "Comentarios", - "Login" : "Iniciar sesión", - "or" : "o", - "Logged in as" : "Sesión iniciada como", - "Send!" : "¡Enviar!", - "No comments yet. Be the first." : "No hay comentarios todavia. Se el primero.", - "No existing polls." : "No hay encuestas existentes.", - "By" : "Por", - "Created" : "Creado", - "participated" : "participó", - "You did not vote" : "No votaste", - "You did not comment" : "No dejaste algún comentario", - "Yourself" : "Tú mismo", - "Never" : "Nunca", - "You voted" : "Votaste", - "You commented" : "Comentaste", - "Click to get link" : "Haz click para obtener una liga", - "Access denied" : "Acceso denegado", - "You are not allowed to view this poll or the poll does not exist." : "No tienes permitido ver esta encuesta o bien la encuesta no existe. " -}, -"nplurals=2; plural=(n != 1);"); diff --git a/l10n/es_EC.json b/l10n/es_EC.json deleted file mode 100644 index 0b86f86e..00000000 --- a/l10n/es_EC.json +++ /dev/null @@ -1,64 +0,0 @@ -{ "translations": { - "Nothing selected!\nClick on cells to turn them green." : "¡No haya nada seleccionado!\nHaz click en las celdas para hacerlas verdes. ", - "You must enter at least a title for the new poll." : "Debes ingresar al menos un título para una nueva encuesta. ", - "Please select at least one user or group!" : "¡Por favor selecciona un usuario o grupo!", - "Do you really want to delete that poll?" : "¿Realmente deseas borrar esa encuesta?", - "Copy to clipboard: Ctrl+C, Enter" : "Copiar a la papelera: Ctrl + C, Enter", - "You are not registered.\nPlease enter your name to vote\n(at least 3 characters)." : "No estás registrado.\nPor favor ingresa tu nombre para votar\n(al menos 3 caracteres).", - "Please add some text to your comment before submitting it." : "Por favor agrega algo de texto a tu comentario antes de enviarlo. ", - "An error occurred, your comment was not posted…" : "Se presentó un error, tu comentario no fue publicado...", - "Polls" : "Encuestas", - "Hello %s,<br/><br/><strong>%s</strong> participated in the poll '%s'.<br/><br/>To go directly to the poll, you can use this <a href=\"%s\">link</a>" : "Hola%s,<br/><br/><strong>%s</strong> participó en la encuesta '%s'.<br/><br/> Para ir directamente a la encuesta, puedes usar esta <a href=\"%s\">liga</a>", - "Polls App - New Comment" : "Aplicación de encuestas - Nuevo Comentario", - "Polls App" : "Aplicación para encuestas", - "Edit poll" : "Editar encuesta", - "Create new poll" : "Crear nueva encuesta", - "Title" : "Título", - "Description" : "Descripción", - "Access" : "Acceso", - "Registered users only" : "Solo usuarios registrados", - "hidden" : "oculto", - "Public access" : "Acceso público", - "Select" : "Seleccionar", - "User/Group search" : "Búsqueda de Usuario / Grupo", - "Anonymous" : "Anónimo", - "Hide user names for admin" : "Ocultar los nombres de usuario de admin", - "Expires" : "Expira", - "Event schedule" : "Calendarización del evento", - "Text based" : "Base texto", - "Dates" : "Fechas", - "Text item" : "Siguente elemento", - "Add" : "Agregar", - "Update poll" : "Actualizar encuesta", - "Create poll" : "Crear encuesta", - "Cancel" : "Cancelar", - "No description provided." : "No se proporcionó una descripción. ", - "Your name here" : "Tu nombre aquí", - "Total" : "Total", - "Best option" : "Mejor opción", - "Vote!" : "¡Vota!", - "Receive notification email on activity" : "Recibir un correo de notificación en actividad ", - "Link" : "Liga", - "Poll expired" : "La encuesta expiró", - "The poll expired on %s. Voting is disabled, but you can still comment." : "La encuesta expiró el %s. La votación esta deshabilitada pero aún puedes comentar. ", - "Comments" : "Comentarios", - "Login" : "Iniciar sesión", - "or" : "o", - "Logged in as" : "Sesión iniciada como", - "Send!" : "¡Enviar!", - "No comments yet. Be the first." : "No hay comentarios todavia. Se el primero.", - "No existing polls." : "No hay encuestas existentes.", - "By" : "Por", - "Created" : "Creado", - "participated" : "participó", - "You did not vote" : "No votaste", - "You did not comment" : "No dejaste algún comentario", - "Yourself" : "Tú mismo", - "Never" : "Nunca", - "You voted" : "Votaste", - "You commented" : "Comentaste", - "Click to get link" : "Haz click para obtener una liga", - "Access denied" : "Acceso denegado", - "You are not allowed to view this poll or the poll does not exist." : "No tienes permitido ver esta encuesta o bien la encuesta no existe. " -},"pluralForm" :"nplurals=2; plural=(n != 1);" -}
\ No newline at end of file diff --git a/l10n/es_MX.js b/l10n/es_MX.js index 58647a8c..a70e4c0d 100644 --- a/l10n/es_MX.js +++ b/l10n/es_MX.js @@ -8,7 +8,6 @@ OC.L10N.register( "Copy to clipboard: Ctrl+C, Enter" : "Copiar a la papelera: Ctrl + C, Enter", "You are not registered.\nPlease enter your name to vote\n(at least 3 characters)." : "No estás registrado.\nPor favor ingresa tu nombre para votar\n(al menos 3 caracteres).", "Please add some text to your comment before submitting it." : "Por favor agrega algo de texto a tu comentario antes de enviarlo. ", - "An error occurred, your comment was not posted…" : "Se presentó un error, tu comentario no fue publicado...", "Polls" : "Encuestas", "Hello %s,<br/><br/><strong>%s</strong> participated in the poll '%s'.<br/><br/>To go directly to the poll, you can use this <a href=\"%s\">link</a>" : "Hola%s,<br/><br/><strong>%s</strong> participó en la encuesta '%s'.<br/><br/> Para ir directamente a la encuesta, puedes usar esta <a href=\"%s\">liga</a>", "Polls App - New Comment" : "Aplicación de encuestas - Nuevo Comentario", @@ -53,12 +52,8 @@ OC.L10N.register( "By" : "Por", "Created" : "Creado", "participated" : "participó", - "You did not vote" : "No votaste", - "You did not comment" : "No dejaste algún comentario", "Yourself" : "Tú mismo", "Never" : "Nunca", - "You voted" : "Votaste", - "You commented" : "Comentaste", "Click to get link" : "Haz click para obtener una liga", "Access denied" : "Acceso denegado", "You are not allowed to view this poll or the poll does not exist." : "No tienes permitido ver esta encuesta o bien la encuesta no existe. " diff --git a/l10n/es_MX.json b/l10n/es_MX.json index 0b86f86e..270ad559 100644 --- a/l10n/es_MX.json +++ b/l10n/es_MX.json @@ -6,7 +6,6 @@ "Copy to clipboard: Ctrl+C, Enter" : "Copiar a la papelera: Ctrl + C, Enter", "You are not registered.\nPlease enter your name to vote\n(at least 3 characters)." : "No estás registrado.\nPor favor ingresa tu nombre para votar\n(al menos 3 caracteres).", "Please add some text to your comment before submitting it." : "Por favor agrega algo de texto a tu comentario antes de enviarlo. ", - "An error occurred, your comment was not posted…" : "Se presentó un error, tu comentario no fue publicado...", "Polls" : "Encuestas", "Hello %s,<br/><br/><strong>%s</strong> participated in the poll '%s'.<br/><br/>To go directly to the poll, you can use this <a href=\"%s\">link</a>" : "Hola%s,<br/><br/><strong>%s</strong> participó en la encuesta '%s'.<br/><br/> Para ir directamente a la encuesta, puedes usar esta <a href=\"%s\">liga</a>", "Polls App - New Comment" : "Aplicación de encuestas - Nuevo Comentario", @@ -51,12 +50,8 @@ "By" : "Por", "Created" : "Creado", "participated" : "participó", - "You did not vote" : "No votaste", - "You did not comment" : "No dejaste algún comentario", "Yourself" : "Tú mismo", "Never" : "Nunca", - "You voted" : "Votaste", - "You commented" : "Comentaste", "Click to get link" : "Haz click para obtener una liga", "Access denied" : "Acceso denegado", "You are not allowed to view this poll or the poll does not exist." : "No tienes permitido ver esta encuesta o bien la encuesta no existe. " @@ -8,7 +8,6 @@ OC.L10N.register( "Copy to clipboard: Ctrl+C, Enter" : "Másolás vágólapra: Ctrl+C, Enter", "You are not registered.\nPlease enter your name to vote\n(at least 3 characters)." : "Nem vagy regisztrálva.\nKérlek add meg a neved a szavazáshoz\n(Legalább 3 karakter).", "Please add some text to your comment before submitting it." : "Kérlek adj hozzá valamilyen szöveget a hozzászólásodhoz beküldés előtt.", - "An error occurred, your comment was not posted…" : "Hiba történt, a hozzászólás nem került elküldésre...", "Polls" : "Szavazások", "Hello %s,<br/><br/><strong>%s</strong> participated in the poll '%s'.<br/><br/>To go directly to the poll, you can use this <a href=\"%s\">link</a>" : "Üdv %s,<br/><br/><strong>%s</strong> részt vett a '%s' szavazásban.<br/><br/>A szavazás közvetlen eléréséhez használd ezt a <a href=\"%s\">linket</a>", "Polls App - New Comment" : "Szavazó App - új hozzászólás", diff --git a/l10n/hu.json b/l10n/hu.json index f7490845..f623f712 100644 --- a/l10n/hu.json +++ b/l10n/hu.json @@ -6,7 +6,6 @@ "Copy to clipboard: Ctrl+C, Enter" : "Másolás vágólapra: Ctrl+C, Enter", "You are not registered.\nPlease enter your name to vote\n(at least 3 characters)." : "Nem vagy regisztrálva.\nKérlek add meg a neved a szavazáshoz\n(Legalább 3 karakter).", "Please add some text to your comment before submitting it." : "Kérlek adj hozzá valamilyen szöveget a hozzászólásodhoz beküldés előtt.", - "An error occurred, your comment was not posted…" : "Hiba történt, a hozzászólás nem került elküldésre...", "Polls" : "Szavazások", "Hello %s,<br/><br/><strong>%s</strong> participated in the poll '%s'.<br/><br/>To go directly to the poll, you can use this <a href=\"%s\">link</a>" : "Üdv %s,<br/><br/><strong>%s</strong> részt vett a '%s' szavazásban.<br/><br/>A szavazás közvetlen eléréséhez használd ezt a <a href=\"%s\">linket</a>", "Polls App - New Comment" : "Szavazó App - új hozzászólás", @@ -1,11 +1,9 @@ OC.L10N.register( "polls", { - "You must enter at least a title for the new poll." : "Du må sette inn tittel for ny spørring", - "Please select at least one user or group!" : "Velg minst en bruker eller gruppe", "Do you really want to delete that poll?" : "Ønsker du virkelig å slette den avstemningen?", "Copy to clipboard: Ctrl+C, Enter" : "Kopier til utklippstavle: Ctrl+C, Enter", - "You are not registered.\nPlease enter your name to vote\n(at least 3 characters)." : "Du er ikke registrert.\nSkriv inn navnet ditt for å stemme\n(minst 3 tegn).", + "You are not registered.\nPlease enter your name to vote\n(at least 3 characters)." : "Du er ikke registrert.\nSkriv inn navnet ditt for å stemme\n(minst tre tegn).", "Polls" : "Avstemninger", "Polls App - New Comment" : "Avstemningsprogram - Ny kommentar", "Polls App" : "Avstemningsprogram", @@ -18,36 +16,20 @@ OC.L10N.register( "hidden" : "skjult", "Public access" : "Offentlig tilgang", "Select" : "Velg", - "Anonymous" : "Anonym", - "Hide user names for admin" : "Skjul brukernavn for admin", "Expires" : "Utløper", - "Text based" : "Tekstbasert", - "Dates" : "Datoer", "Text item" : "Tekstelement", "Add" : "Legg til", - "Update poll" : "Oppdater skjema", "Cancel" : "Avbryt", - "No description provided." : "Ingen beskrivelse angitt", "Your name here" : "Ditt navn her", - "Total" : "Totalt", - "Vote!" : "Stem!", - "Receive notification email on activity" : "Motta epost-varsel ved aktivitet", - "Link" : "Lenke", "Comments" : "Kommentarer", - "Login" : "Logg inn", "or" : "eller", "Logged in as" : "Innlogget som", - "Send!" : "Send!", - "No comments yet. Be the first." : "Ingen kommentarer enda. Vær først.", - "No existing polls." : "Ingen eksisterende avstemninger.", "By" : "Av", "Created" : "Opprettet", "participated" : "deltok", "You did not vote" : "Du stemte ikke", - "You did not comment" : "Du kommenterte ikke", "Yourself" : "Deg selv", "Never" : "Aldri", - "You voted" : "Du stemte", "You commented" : "Du kommenterte", "Click to get link" : "Klikk for å hente lenke", "Access denied" : "Tilgang nektet", diff --git a/l10n/nb.json b/l10n/nb.json index d41482a9..4a1fbaff 100644 --- a/l10n/nb.json +++ b/l10n/nb.json @@ -1,9 +1,7 @@ { "translations": { - "You must enter at least a title for the new poll." : "Du må sette inn tittel for ny spørring", - "Please select at least one user or group!" : "Velg minst en bruker eller gruppe", "Do you really want to delete that poll?" : "Ønsker du virkelig å slette den avstemningen?", "Copy to clipboard: Ctrl+C, Enter" : "Kopier til utklippstavle: Ctrl+C, Enter", - "You are not registered.\nPlease enter your name to vote\n(at least 3 characters)." : "Du er ikke registrert.\nSkriv inn navnet ditt for å stemme\n(minst 3 tegn).", + "You are not registered.\nPlease enter your name to vote\n(at least 3 characters)." : "Du er ikke registrert.\nSkriv inn navnet ditt for å stemme\n(minst tre tegn).", "Polls" : "Avstemninger", "Polls App - New Comment" : "Avstemningsprogram - Ny kommentar", "Polls App" : "Avstemningsprogram", @@ -16,36 +14,20 @@ "hidden" : "skjult", "Public access" : "Offentlig tilgang", "Select" : "Velg", - "Anonymous" : "Anonym", - "Hide user names for admin" : "Skjul brukernavn for admin", "Expires" : "Utløper", - "Text based" : "Tekstbasert", - "Dates" : "Datoer", "Text item" : "Tekstelement", "Add" : "Legg til", - "Update poll" : "Oppdater skjema", "Cancel" : "Avbryt", - "No description provided." : "Ingen beskrivelse angitt", "Your name here" : "Ditt navn her", - "Total" : "Totalt", - "Vote!" : "Stem!", - "Receive notification email on activity" : "Motta epost-varsel ved aktivitet", - "Link" : "Lenke", "Comments" : "Kommentarer", - "Login" : "Logg inn", "or" : "eller", "Logged in as" : "Innlogget som", - "Send!" : "Send!", - "No comments yet. Be the first." : "Ingen kommentarer enda. Vær først.", - "No existing polls." : "Ingen eksisterende avstemninger.", "By" : "Av", "Created" : "Opprettet", "participated" : "deltok", "You did not vote" : "Du stemte ikke", - "You did not comment" : "Du kommenterte ikke", "Yourself" : "Deg selv", "Never" : "Aldri", - "You voted" : "Du stemte", "You commented" : "Du kommenterte", "Click to get link" : "Klikk for å hente lenke", "Access denied" : "Tilgang nektet", @@ -7,11 +7,8 @@ OC.L10N.register( "Do you really want to delete that poll?" : "Wil je echt deze poll verwijderen?", "Copy to clipboard: Ctrl+C, Enter" : "Kopiëren naar het klembord: Ctrl+C, Enter", "You are not registered.\nPlease enter your name to vote\n(at least 3 characters)." : "U bent niet geregistreerd\nGeef uw naam in om te stemmen\n(tenminste 3 tekens).", - "Please add some text to your comment before submitting it." : "Gelieve wat tekst aan de reactie toe te voegen voordat je hem plaatst.", - "An error occurred, your comment was not posted…" : "Er heeft zich een fout voorgedaan, jouw reactie is niet geplaatst...", + "An error occurred, your comment was not posted…" : "Er heeft zich een fout voorgedaan, uw opmerking is niet gepost...", "Polls" : "Polls", - "Hello %s,<br/><br/><strong>%s</strong> participated in the poll '%s'.<br/><br/>To go directly to the poll, you can use this <a href=\"%s\">link</a>" : "Hallo %s,<br/><br/><strong>%s</strong> heeft deelgenomen aan de poll '%s'.<br/><br/>Om direct naar de poll te gaan gebruik je deze <a href=\"%s\">link</a>", - "Polls App - New Comment" : "Polls App - Nieuwe Reactie", "Polls App" : "Polls App", "Edit poll" : "Poll bijwerken", "Create new poll" : "Nieuwe poll aanmaken", @@ -22,9 +19,8 @@ OC.L10N.register( "hidden" : "verborgen", "Public access" : "Openbare toegang", "Select" : "Selecteren", - "User/Group search" : "Gebruiker/Groep zoeken", "Anonymous" : "Anoniem", - "Hide user names for admin" : "Verberg gebruikersnamen voor beheerder", + "Hide user names for admin" : "Verberg gebruikersnamen voor administratoren", "Expires" : "Verstreken termijn", "Event schedule" : "Evenementschema", "Text based" : "Tekst gebaseerd", @@ -39,15 +35,13 @@ OC.L10N.register( "Total" : "Totaal", "Best option" : "Beste optie", "Vote!" : "Stemmen!", - "Receive notification email on activity" : "Ontvang email melding bij activiteit", "Link" : "Link", "Poll expired" : "Poll is verlopen", - "The poll expired on %s. Voting is disabled, but you can still comment." : "De poll is verlopen op %s. Stemmen is uitgeschakeld, maar je kunt nog steeds reacties plaatsen.", "Comments" : "Reacties", "Login" : "Inloggen", "or" : "of", "Logged in as" : "Ingelogd als", - "Send!" : "Plaats reactie!", + "Send!" : "Zend!", "No comments yet. Be the first." : "Nog geen reacties. Ben de eerste.", "No existing polls." : "Geen bestaande polls.", "By" : "Door", diff --git a/l10n/nl.json b/l10n/nl.json index 1fbf054b..c4c44d93 100644 --- a/l10n/nl.json +++ b/l10n/nl.json @@ -5,11 +5,8 @@ "Do you really want to delete that poll?" : "Wil je echt deze poll verwijderen?", "Copy to clipboard: Ctrl+C, Enter" : "Kopiëren naar het klembord: Ctrl+C, Enter", "You are not registered.\nPlease enter your name to vote\n(at least 3 characters)." : "U bent niet geregistreerd\nGeef uw naam in om te stemmen\n(tenminste 3 tekens).", - "Please add some text to your comment before submitting it." : "Gelieve wat tekst aan de reactie toe te voegen voordat je hem plaatst.", - "An error occurred, your comment was not posted…" : "Er heeft zich een fout voorgedaan, jouw reactie is niet geplaatst...", + "An error occurred, your comment was not posted…" : "Er heeft zich een fout voorgedaan, uw opmerking is niet gepost...", "Polls" : "Polls", - "Hello %s,<br/><br/><strong>%s</strong> participated in the poll '%s'.<br/><br/>To go directly to the poll, you can use this <a href=\"%s\">link</a>" : "Hallo %s,<br/><br/><strong>%s</strong> heeft deelgenomen aan de poll '%s'.<br/><br/>Om direct naar de poll te gaan gebruik je deze <a href=\"%s\">link</a>", - "Polls App - New Comment" : "Polls App - Nieuwe Reactie", "Polls App" : "Polls App", "Edit poll" : "Poll bijwerken", "Create new poll" : "Nieuwe poll aanmaken", @@ -20,9 +17,8 @@ "hidden" : "verborgen", "Public access" : "Openbare toegang", "Select" : "Selecteren", - "User/Group search" : "Gebruiker/Groep zoeken", "Anonymous" : "Anoniem", - "Hide user names for admin" : "Verberg gebruikersnamen voor beheerder", + "Hide user names for admin" : "Verberg gebruikersnamen voor administratoren", "Expires" : "Verstreken termijn", "Event schedule" : "Evenementschema", "Text based" : "Tekst gebaseerd", @@ -37,15 +33,13 @@ "Total" : "Totaal", "Best option" : "Beste optie", "Vote!" : "Stemmen!", - "Receive notification email on activity" : "Ontvang email melding bij activiteit", "Link" : "Link", "Poll expired" : "Poll is verlopen", - "The poll expired on %s. Voting is disabled, but you can still comment." : "De poll is verlopen op %s. Stemmen is uitgeschakeld, maar je kunt nog steeds reacties plaatsen.", "Comments" : "Reacties", "Login" : "Inloggen", "or" : "of", "Logged in as" : "Ingelogd als", - "Send!" : "Plaats reactie!", + "Send!" : "Zend!", "No comments yet. Be the first." : "Nog geen reacties. Ben de eerste.", "No existing polls." : "Geen bestaande polls.", "By" : "Door", diff --git a/l10n/sk.js b/l10n/sk.js deleted file mode 100644 index 6197d44c..00000000 --- a/l10n/sk.js +++ /dev/null @@ -1,66 +0,0 @@ -OC.L10N.register( - "polls", - { - "Nothing selected!\nClick on cells to turn them green." : "Nič ste nevybrali!\nKliknutím na bunky ich zmeníte na zelené.", - "You must enter at least a title for the new poll." : "Pre novú anketu musíte zadať aspoň názov.", - "Please select at least one user or group!" : "Vyberte prosím aspoň jedného používateľa alebo skupinu.", - "Do you really want to delete that poll?" : "Naozaj chcete tú anketu vymazať?", - "Copy to clipboard: Ctrl+C, Enter" : "Skopírovať do schránky: Ctrl+C, Enter", - "You are not registered.\nPlease enter your name to vote\n(at least 3 characters)." : "Nie ste zaregistrovaní.\nPre odoslanie hlasu zadajte prosím svoje meno\n(aspoň tri znaky).", - "Please add some text to your comment before submitting it." : "Zadajte prosím nejaký text predtým než odošlete svoj komentár.", - "An error occurred, your comment was not posted…" : "Vyskytla sa chyba, váš komentár sa neodoslal...", - "Polls" : "Ankety", - "Hello %s,<br/><br/><strong>%s</strong> participated in the poll '%s'.<br/><br/>To go directly to the poll, you can use this <a href=\"%s\">link</a>" : "Ahoj %s,<br/><br/><strong>%s</strong>sa zúčastnil v ankete '%s'.<br/><br/>Kliknutím na <a href=\"%s\">link</a> sa dostanete priamo k ankete.", - "Polls App - New Comment" : "Aplikácia Ankety - Nový komentár", - "Polls App" : "Aplikácia Ankety", - "Edit poll" : "Upraviť anketu", - "Create new poll" : "Vytvoriť novú anketu", - "Title" : "Názov", - "Description" : "Popis", - "Access" : "Prístup", - "Registered users only" : "Len zaregistrovaní používatelia", - "hidden" : "skryté", - "Public access" : "Verejný prístup", - "Select" : "Vybrať", - "User/Group search" : "Hľadať používateľa/skupinu", - "Anonymous" : "Anononymný", - "Hide user names for admin" : "Skryť používateľské mená pre správcu", - "Expires" : "Vyprší", - "Event schedule" : "Plán udalostí", - "Text based" : "založené na texte", - "Dates" : "Dátumy", - "Text item" : "Textová položka", - "Add" : "Pridať", - "Update poll" : "Aktualizovať anketu", - "Create poll" : "Vytvoriť anketu", - "Cancel" : "Zrušiť", - "No description provided." : "Nebol poskytnutý žiadny popis", - "Your name here" : "Vaše meno sem", - "Total" : "Celkom", - "Best option" : "Najlepšia voľba", - "Vote!" : "Hlasujte!", - "Receive notification email on activity" : "Pri aktivite prijímať oznámenia e-mailom", - "Link" : "Odkaz", - "Poll expired" : "Anketa vypršala", - "The poll expired on %s. Voting is disabled, but you can still comment." : "Anketa vypršala %s. Hlasovanie je vypnuté, ale stále môžete prispieť komentárom.", - "Comments" : "Komentáre", - "Login" : "Prihlásiť sa", - "or" : "alebo", - "Logged in as" : "Prihlásený ako", - "Send!" : "Odoslať", - "No comments yet. Be the first." : "Zatiaľ žiadne komentáre. Buďte prvý.", - "No existing polls." : "Žiadne existujúce ankety.", - "By" : "Od", - "Created" : "Vytvorené", - "participated" : "zúčastnený", - "You did not vote" : "Nehlasovali ste", - "You did not comment" : "Nekomentovali ste", - "Yourself" : "Sám", - "Never" : "Nikdy", - "You voted" : "Hlasovali ste", - "You commented" : "Komentovali ste", - "Click to get link" : "Kliknite na získanie odkazu", - "Access denied" : "Prístup zamietnutý", - "You are not allowed to view this poll or the poll does not exist." : "Nemáte oprávnenie na prezeranie tejto ankety alebo už anketa neexistuje." -}, -"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"); diff --git a/l10n/sk.json b/l10n/sk.json deleted file mode 100644 index 52b00f6b..00000000 --- a/l10n/sk.json +++ /dev/null @@ -1,64 +0,0 @@ -{ "translations": { - "Nothing selected!\nClick on cells to turn them green." : "Nič ste nevybrali!\nKliknutím na bunky ich zmeníte na zelené.", - "You must enter at least a title for the new poll." : "Pre novú anketu musíte zadať aspoň názov.", - "Please select at least one user or group!" : "Vyberte prosím aspoň jedného používateľa alebo skupinu.", - "Do you really want to delete that poll?" : "Naozaj chcete tú anketu vymazať?", - "Copy to clipboard: Ctrl+C, Enter" : "Skopírovať do schránky: Ctrl+C, Enter", - "You are not registered.\nPlease enter your name to vote\n(at least 3 characters)." : "Nie ste zaregistrovaní.\nPre odoslanie hlasu zadajte prosím svoje meno\n(aspoň tri znaky).", - "Please add some text to your comment before submitting it." : "Zadajte prosím nejaký text predtým než odošlete svoj komentár.", - "An error occurred, your comment was not posted…" : "Vyskytla sa chyba, váš komentár sa neodoslal...", - "Polls" : "Ankety", - "Hello %s,<br/><br/><strong>%s</strong> participated in the poll '%s'.<br/><br/>To go directly to the poll, you can use this <a href=\"%s\">link</a>" : "Ahoj %s,<br/><br/><strong>%s</strong>sa zúčastnil v ankete '%s'.<br/><br/>Kliknutím na <a href=\"%s\">link</a> sa dostanete priamo k ankete.", - "Polls App - New Comment" : "Aplikácia Ankety - Nový komentár", - "Polls App" : "Aplikácia Ankety", - "Edit poll" : "Upraviť anketu", - "Create new poll" : "Vytvoriť novú anketu", - "Title" : "Názov", - "Description" : "Popis", - "Access" : "Prístup", - "Registered users only" : "Len zaregistrovaní používatelia", - "hidden" : "skryté", - "Public access" : "Verejný prístup", - "Select" : "Vybrať", - "User/Group search" : "Hľadať používateľa/skupinu", - "Anonymous" : "Anononymný", - "Hide user names for admin" : "Skryť používateľské mená pre správcu", - "Expires" : "Vyprší", - "Event schedule" : "Plán udalostí", - "Text based" : "založené na texte", - "Dates" : "Dátumy", - "Text item" : "Textová položka", - "Add" : "Pridať", - "Update poll" : "Aktualizovať anketu", - "Create poll" : "Vytvoriť anketu", - "Cancel" : "Zrušiť", - "No description provided." : "Nebol poskytnutý žiadny popis", - "Your name here" : "Vaše meno sem", - "Total" : "Celkom", - "Best option" : "Najlepšia voľba", - "Vote!" : "Hlasujte!", - "Receive notification email on activity" : "Pri aktivite prijímať oznámenia e-mailom", - "Link" : "Odkaz", - "Poll expired" : "Anketa vypršala", - "The poll expired on %s. Voting is disabled, but you can still comment." : "Anketa vypršala %s. Hlasovanie je vypnuté, ale stále môžete prispieť komentárom.", - "Comments" : "Komentáre", - "Login" : "Prihlásiť sa", - "or" : "alebo", - "Logged in as" : "Prihlásený ako", - "Send!" : "Odoslať", - "No comments yet. Be the first." : "Zatiaľ žiadne komentáre. Buďte prvý.", - "No existing polls." : "Žiadne existujúce ankety.", - "By" : "Od", - "Created" : "Vytvorené", - "participated" : "zúčastnený", - "You did not vote" : "Nehlasovali ste", - "You did not comment" : "Nekomentovali ste", - "Yourself" : "Sám", - "Never" : "Nikdy", - "You voted" : "Hlasovali ste", - "You commented" : "Komentovali ste", - "Click to get link" : "Kliknite na získanie odkazu", - "Access denied" : "Prístup zamietnutý", - "You are not allowed to view this poll or the poll does not exist." : "Nemáte oprávnenie na prezeranie tejto ankety alebo už anketa neexistuje." -},"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;" -}
\ No newline at end of file diff --git a/lib/Controller/PageController.php b/lib/Controller/PageController.php index 232d60dc..96cb62bf 100644 --- a/lib/Controller/PageController.php +++ b/lib/Controller/PageController.php @@ -218,11 +218,7 @@ class PageController extends Controller { * @return TemplateResponse */ public function gotoPoll($hash) { - try { - $poll = $this->eventMapper->findByHash($hash); - } catch(DoesNotExistException $e) { - return new TemplateResponse('polls', 'no.acc.tmpl', []); - } + $poll = $this->eventMapper->findByHash($hash); if ($poll->getType() == '0') { $dates = $this->dateMapper->findByPoll($poll->getId()); $votes = $this->participationMapper->findByPoll($poll->getId()); @@ -439,12 +435,10 @@ class PageController extends Controller { $event->setDescription(htmlspecialchars($pollDesc)); $event->setOwner($userId); $event->setCreated(date('Y-m-d H:i:s')); - $event->setHash(\OC::$server->getSecureRandom()->generate( - 16, + $event->setHash(\OC::$server->getSecureRandom()->getMediumStrengthGenerator()->generate(16, ISecureRandom::CHAR_DIGITS . ISecureRandom::CHAR_LOWER . - ISecureRandom::CHAR_UPPER - )); + ISecureRandom::CHAR_UPPER)); $event->setIsAnonymous($isAnonymous ? 1 : 0); $event->setFullAnonymous($isAnonymous && $hideNames ? 1 : 0); diff --git a/lib/Db/Comment.php b/lib/Db/Comment.php index bbfb5403..28b5ae35 100644 --- a/lib/Db/Comment.php +++ b/lib/Db/Comment.php @@ -23,6 +23,8 @@ namespace OCA\Polls\Db; +use OCP\AppFramework\Db\Entity; + /** * @method string getUserId() * @method void setUserId(string $value) @@ -33,9 +35,9 @@ namespace OCA\Polls\Db; * @method integer getPollId() * @method void setPollId(integer $value) */ -class Comment extends Model { - protected $userId; - protected $dt; - protected $comment; - protected $pollId; +class Comment extends Entity { + public $userId; + public $dt; + public $comment; + public $pollId; } diff --git a/lib/Db/Date.php b/lib/Db/Date.php index 5363ec6a..d34a9a41 100644 --- a/lib/Db/Date.php +++ b/lib/Db/Date.php @@ -23,13 +23,15 @@ namespace OCA\Polls\Db; +use OCP\AppFramework\Db\Entity; + /** - * @method string getDt() - * @method void setDt(string $value) + * @method timestamp getDt() + * @method void setDt(timestamp $value) * @method integer getPollId() * @method void setPollId(integer $value) */ -class Date extends Model { - protected $dt; - protected $pollId; +class Date extends Entity { + public $dt; + public $pollId; } diff --git a/lib/Db/Event.php b/lib/Db/Event.php index f422f0b6..df4c1ca8 100644 --- a/lib/Db/Event.php +++ b/lib/Db/Event.php @@ -23,6 +23,8 @@ namespace OCA\Polls\Db; +use OCP\AppFramework\Db\Entity; + /** * @method integer getType() * @method void setType(integer $value) @@ -32,12 +34,12 @@ namespace OCA\Polls\Db; * @method void setDescription(string $value) * @method string getOwner() * @method void setOwner(string $value) - * @method string getCreated() - * @method void setCreated(string $value) + * @method timestamp getCreated() + * @method void setCreated(timestamp $value) * @method string getAccess() * @method void setAccess(string $value) - * @method string getExpire() - * @method void setExpire(string $value) + * @method timestamp getExpire() + * @method void setExpire(timestamp $value) * @method string getHash() * @method void setHash(string $value) * @method integer getIsAnonymous() @@ -45,15 +47,15 @@ namespace OCA\Polls\Db; * @method integer getFullAnonymous() * @method void setFullAnonymous(integer $value) */ -class Event extends Model { - protected $type; - protected $title; - protected $description; - protected $owner; - protected $created; - protected $access; - protected $expire; - protected $hash; - protected $isAnonymous; - protected $fullAnonymous; +class Event extends Entity { + public $type; + public $title; + public $description; + public $owner; + public $created; + public $access; + public $expire; + public $hash; + public $isAnonymous; + public $fullAnonymous; } diff --git a/lib/Db/EventMapper.php b/lib/Db/EventMapper.php index dabb28ac..44ed6a84 100644 --- a/lib/Db/EventMapper.php +++ b/lib/Db/EventMapper.php @@ -51,8 +51,6 @@ class EventMapper extends Mapper { * @param $hash * @param int $limit * @param int $offset - * @throws \OCP\AppFramework\Db\DoesNotExistException if not found - * @throws \OCP\AppFramework\Db\MultipleObjectsReturnedException if more than one result * @return Event */ public function findByHash($hash, $limit = null, $offset = null) { diff --git a/lib/Db/Model.php b/lib/Db/Model.php deleted file mode 100644 index 087f4842..00000000 --- a/lib/Db/Model.php +++ /dev/null @@ -1,39 +0,0 @@ -<?php -/** - * @copyright Copyright (c) 2017 Kai Schröer <git@schroeer.co> - * - * @author Kai Schröer <git@schroeer.co> - * - * @license GNU AGPL version 3 or any later version - * - * 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 <http://www.gnu.org/licenses/>. - * - */ - -namespace OCA\Polls\Db; - -use OCP\AppFramework\Db\Entity; - -abstract class Model extends Entity { - /** - * FactoryMuffin checks for the existence of setters with method_exists($obj, $attr) but that returns false. - * By overwriting the __set() magic method we can trigger the changed flag on $obj->attr assignment. - * - * @param $name - * @param $value - */ - public function __set($name, $value) { - $this->setter($name, [$value]); - } -} diff --git a/lib/Db/Notification.php b/lib/Db/Notification.php index 53d717dc..eb5c2180 100644 --- a/lib/Db/Notification.php +++ b/lib/Db/Notification.php @@ -23,13 +23,15 @@ namespace OCA\Polls\Db; +use OCP\AppFramework\Db\Entity; + /** * @method string getUserId() * @method void setUserId(string $value) * @method string getPollId() * @method void setPollId(string $value) */ -class Notification extends Model { - protected $userId; - protected $pollId; +class Notification extends Entity { + public $userId; + public $pollId; } diff --git a/lib/Db/NotificationMapper.php b/lib/Db/NotificationMapper.php index 38b73b74..c5ee3b38 100644 --- a/lib/Db/NotificationMapper.php +++ b/lib/Db/NotificationMapper.php @@ -80,9 +80,7 @@ class NotificationMapper extends Mapper { /** * @param string $pollId * @param string $userId - * @throws \OCP\AppFramework\Db\DoesNotExistException if not found - * @throws \OCP\AppFramework\Db\MultipleObjectsReturnedException if more than one result - * @return Notification + * @return Notification if not found */ public function findByUserAndPoll($pollId, $userId) { $sql = 'SELECT * FROM ' . $this->getTableName() . ' WHERE poll_id = ? AND user_id = ?'; diff --git a/lib/Db/Participation.php b/lib/Db/Participation.php index 317561dc..a8494c86 100644 --- a/lib/Db/Participation.php +++ b/lib/Db/Participation.php @@ -23,9 +23,11 @@ namespace OCA\Polls\Db; +use OCP\AppFramework\Db\Entity; + /** - * @method string getDt() - * @method void setDt(string $value) + * @method timestamp getDt() + * @method void setDt(timestamp $value) * @method string getUserId() * @method void setUserId(string $value) * @method integer getPollId() @@ -33,9 +35,9 @@ namespace OCA\Polls\Db; * @method integer getType() * @method void setType(integer $value) */ -class Participation extends Model { - protected $dt; - protected $userId; - protected $pollId; - protected $type; +class Participation extends Entity { + public $dt; + public $userId; + public $pollId; + public $type; } diff --git a/lib/Db/ParticipationText.php b/lib/Db/ParticipationText.php index 064c50d3..6fd05cca 100644 --- a/lib/Db/ParticipationText.php +++ b/lib/Db/ParticipationText.php @@ -23,6 +23,8 @@ namespace OCA\Polls\Db; +use OCP\AppFramework\Db\Entity; + /** * @method text getText() * @method void setText(text $value) @@ -33,9 +35,9 @@ namespace OCA\Polls\Db; * @method integer getType() * @method void setType(integer $value) */ -class ParticipationText extends Model { - protected $text; - protected $userId; - protected $pollId; - protected $type; +class ParticipationText extends Entity { + public $text; + public $userId; + public $pollId; + public $type; } diff --git a/lib/Db/Text.php b/lib/Db/Text.php index c888dbdc..792e4caf 100644 --- a/lib/Db/Text.php +++ b/lib/Db/Text.php @@ -23,13 +23,15 @@ namespace OCA\Polls\Db; +use OCP\AppFramework\Db\Entity; + /** * @method string getText() * @method void setText(string $value) * @method integer getPollId() * @method void setPollId(integer $value) */ -class Text extends Model { - protected $text; - protected $pollId; +class Text extends Entity { + public $text; + public $pollId; } diff --git a/phpunit.xml b/phpunit.xml index ac369548..82c96d6c 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -1,9 +1,4 @@ <phpunit bootstrap="tests/bootstrap.php" colors="true"> - <filter> - <whitelist> - <directory suffix=".php">lib</directory> - </whitelist> - </filter> <testsuites> <testsuite name="unit"> <directory>./tests/Unit</directory> diff --git a/screenshots/new-poll-oc.png b/screenshots/new-poll-oc.png Binary files differdeleted file mode 100644 index d90fa591..00000000 --- a/screenshots/new-poll-oc.png +++ /dev/null diff --git a/screenshots/overview-oc.png b/screenshots/overview-oc.png Binary files differdeleted file mode 100644 index 5c9407cc..00000000 --- a/screenshots/overview-oc.png +++ /dev/null diff --git a/screenshots/vote-oc.png b/screenshots/vote-oc.png Binary files differdeleted file mode 100644 index 6b94adbc..00000000 --- a/screenshots/vote-oc.png +++ /dev/null diff --git a/templates/main.tmpl.php b/templates/main.tmpl.php index 0ebb67ca..938debec 100644 --- a/templates/main.tmpl.php +++ b/templates/main.tmpl.php @@ -98,12 +98,12 @@ $participated = $_['participations_text']; } $participated_class = 'partic_no'; - $participated_title = $l->t('You did not vote'); + $participated_title = 'You did not vote'; $participated_count = count($participated); $comments = $_['comments']; $commented_class = 'commented_no'; - $commented_title = $l->t('You did not comment'); + $commented_title = 'You did not comment'; $commented_count = count($comments); if ($owner == $userId) { @@ -126,7 +126,7 @@ for ($i = 0; $i < count($participated); $i++) { if ($poll->getId() == intval($participated[$i]->getPollId())) { $participated_class = 'partic_yes'; - $participated_title = $l->t('You voted'); + $participated_title = 'You voted'; array_splice($participated, $i, 1); break; } @@ -135,7 +135,7 @@ for ($i = 0; $i < count($comments); $i++) { if ($poll->getId() == intval($comments[$i]->getPollId())) { $commented_class = 'commented_yes'; - $commented_title = $l->t('You commented'); + $commented_title = 'You commented'; array_splice($comments, $i, 1); break; } diff --git a/tests/Integration/AppTest.php b/tests/Integration/AppTest.php index 346eace3..3e07ab3c 100644 --- a/tests/Integration/AppTest.php +++ b/tests/Integration/AppTest.php @@ -1,8 +1,8 @@ <?php /** - * @copyright Copyright (c) 2017 Kai Schröer <git@schroeer.co> + * @copyright Copyright (c) 2017 Vinzenz Rosenkranz <vinzenz.rosenkranz@gmail.com> * - * @author Kai Schröer <git@schroeer.co> + * @author Kai Schröer <kai@schroeer.co> * * @license GNU AGPL version 3 or any later version * diff --git a/tests/Unit/Controller/PageControllerTest.php b/tests/Unit/Controller/PageControllerTest.php index 302d44fe..9090d0cf 100644 --- a/tests/Unit/Controller/PageControllerTest.php +++ b/tests/Unit/Controller/PageControllerTest.php @@ -1,8 +1,8 @@ <?php /** - * @copyright Copyright (c) 2017 Kai Schröer <git@schroeer.co> + * @copyright Copyright (c) 2017 Vinzenz Rosenkranz <vinzenz.rosenkranz@gmail.com> * - * @author Kai Schröer <git@schroeer.co> + * @author Kai Schröer <kai@schroeer.co> * * @license GNU AGPL version 3 or any later version * @@ -24,19 +24,14 @@ namespace OCA\Polls\Tests\Unit\Controller; use OCA\Polls\Controller\PageController; -use OCA\Polls\Tests\Unit\UnitTestCase; use OCP\AppFramework\Http\TemplateResponse; +use PHPUnit_Framework_TestCase; -class PageControllerTest extends UnitTestCase { +class PageControllerTest extends PHPUnit_Framework_TestCase { - /** @var PageController */ private $controller; - private $userId = 'john'; - /** - * {@inheritDoc} - */ public function setUp() { $request = $this->getMockBuilder('OCP\IRequest') ->disableOriginalConstructor() @@ -101,13 +96,10 @@ class PageControllerTest extends UnitTestCase { ); } - /** - * Basic controller index route test. - */ public function testIndex() { $result = $this->controller->index(); $this->assertEquals('main.tmpl', $result->getTemplateName()); - $this->assertInstanceOf(TemplateResponse::class, $result); + $this->assertTrue($result instanceof TemplateResponse); } } diff --git a/tests/Unit/Db/CommentMapperTest.php b/tests/Unit/Db/CommentMapperTest.php deleted file mode 100644 index 7cd845dd..00000000 --- a/tests/Unit/Db/CommentMapperTest.php +++ /dev/null @@ -1,97 +0,0 @@ -<?php -/** - * @copyright Copyright (c) 2017 Kai Schröer <git@schroeer.co> - * - * @author Kai Schröer <git@schroeer.co> - * - * @license GNU AGPL version 3 or any later version - * - * 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 <http://www.gnu.org/licenses/>. - * - */ - -namespace OCA\Polls\Tests\Unit\Db; - -use OCA\Polls\Db\Comment; -use OCA\Polls\Db\CommentMapper; -use OCA\Polls\Db\Event; -use OCA\Polls\Db\EventMapper; -use OCA\Polls\Tests\Unit\UnitTestCase; -use OCP\IDBConnection; -use League\FactoryMuffin\Faker\Facade as Faker; - -class CommentMapperTest extends UnitTestCase { - - /** @var IDBConnection */ - private $con; - /** @var CommentMapper */ - private $commentMapper; - /** @var EventMapper */ - private $eventMapper; - - /** - * {@inheritDoc} - */ - public function setUp() { - parent::setUp(); - $this->con = \OC::$server->getDatabaseConnection(); - $this->commentMapper = new CommentMapper($this->con); - $this->eventMapper = new EventMapper($this->con); - } - - /** - * Create some fake data and persist them to the database. - * - * @return Comment - */ - public function testCreate() { - /** @var Event $event */ - $event = $this->fm->instance('OCA\Polls\Db\Event'); - $this->assertInstanceOf(Event::class, $this->eventMapper->insert($event)); - - /** @var Comment $comment */ - $comment = $this->fm->instance('OCA\Polls\Db\Comment'); - $comment->setPollId($event->getId()); - $this->assertInstanceOf(Comment::class, $this->commentMapper->insert($comment)); - - return $comment; - } - - /** - * Update the previously created entry and persist the changes. - * - * @depends testCreate - * @param Comment $comment - * @return Comment - */ - public function testUpdate(Comment $comment) { - $newComment = Faker::paragraph(); - $comment->setComment($newComment()); - $this->commentMapper->update($comment); - - return $comment; - } - - /** - * Delete the previously created entries from the database. - * - * @depends testUpdate - * @param Comment $comment - */ - public function testDelete(Comment $comment) { - $event = $this->eventMapper->find($comment->getPollId()); - $this->commentMapper->delete($comment); - $this->eventMapper->delete($event); - } -} diff --git a/tests/Unit/Db/DateMapperTest.php b/tests/Unit/Db/DateMapperTest.php deleted file mode 100644 index 7b02b68e..00000000 --- a/tests/Unit/Db/DateMapperTest.php +++ /dev/null @@ -1,97 +0,0 @@ -<?php -/** - * @copyright Copyright (c) 2017 Kai Schröer <git@schroeer.co> - * - * @author Kai Schröer <git@schroeer.co> - * - * @license GNU AGPL version 3 or any later version - * - * 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 <http://www.gnu.org/licenses/>. - * - */ - -namespace OCA\Polls\Tests\Unit\Db; - -use OCA\Polls\Db\Date; -use OCA\Polls\Db\DateMapper; -use OCA\Polls\Db\Event; -use OCA\Polls\Db\EventMapper; -use OCA\Polls\Tests\Unit\UnitTestCase; -use OCP\IDBConnection; -use League\FactoryMuffin\Faker\Facade as Faker; - -class DateMapperTest extends UnitTestCase { - - /** @var IDBConnection */ - private $con; - /** @var DateMapper */ - private $dateMapper; - /** @var EventMapper */ - private $eventMapper; - - /** - * {@inheritDoc} - */ - public function setUp() { - parent::setUp(); - $this->con = \OC::$server->getDatabaseConnection(); - $this->dateMapper = new DateMapper($this->con); - $this->eventMapper = new EventMapper($this->con); - } - - /** - * Create some fake data and persist them to the database. - * - * @return Date - */ - public function testCreate() { - /** @var Event $event */ - $event = $this->fm->instance('OCA\Polls\Db\Event'); - $this->assertInstanceOf(Event::class, $this->eventMapper->insert($event)); - - /** @var Date $date */ - $date = $this->fm->instance('OCA\Polls\Db\Date'); - $date->setPollId($event->getId()); - $this->assertInstanceOf(Date::class, $this->dateMapper->insert($date)); - - return $date; - } - - /** - * Update the previously created entry and persist the changes. - * - * @depends testCreate - * @param Date $date - * @return Date - */ - public function testUpdate(Date $date) { - $newDt = Faker::date('Y-m-d H:i:s'); - $date->setDt($newDt()); - $this->dateMapper->update($date); - - return $date; - } - - /** - * Delete the previously created entries from the database. - * - * @depends testUpdate - * @param Date $date - */ - public function testDelete(Date $date) { - $event = $this->eventMapper->find($date->getPollId()); - $this->dateMapper->delete($date); - $this->eventMapper->delete($event); - } -} diff --git a/tests/Unit/Db/EventMapperTest.php b/tests/Unit/Db/EventMapperTest.php deleted file mode 100644 index 3c7b1a8f..00000000 --- a/tests/Unit/Db/EventMapperTest.php +++ /dev/null @@ -1,87 +0,0 @@ -<?php -/** - * @copyright Copyright (c) 2017 Kai Schröer <git@schroeer.co> - * - * @author Kai Schröer <git@schroeer.co> - * - * @license GNU AGPL version 3 or any later version - * - * 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 <http://www.gnu.org/licenses/>. - * - */ - -namespace OCA\Polls\Tests\Unit\Db; - -use OCA\Polls\Db\Event; -use OCA\Polls\Db\EventMapper; -use OCA\Polls\Tests\Unit\UnitTestCase; -use OCP\IDBConnection; -use League\FactoryMuffin\Faker\Facade as Faker; - -class EventMapperTest extends UnitTestCase { - - /** @var IDBConnection */ - private $con; - /** @var EventMapper */ - private $eventMapper; - - /** - * {@inheritDoc} - */ - public function setUp() { - parent::setUp(); - $this->con = \OC::$server->getDatabaseConnection(); - $this->eventMapper = new EventMapper($this->con); - } - - /** - * Create some fake data and persist them to the database. - * - * @return Event - */ - public function testCreate() { - /** @var Event $event */ - $event = $this->fm->instance('OCA\Polls\Db\Event'); - $this->assertInstanceOf(Event::class, $this->eventMapper->insert($event)); - - return $event; - } - - /** - * Update the previously created entry and persist the changes. - * - * @depends testCreate - * @param Event $event - * @return Event - */ - public function testUpdate(Event $event) { - $newTitle = Faker::sentence(10); - $newDescription = Faker::paragraph(); - $event->setTitle($newTitle()); - $event->setDescription($newDescription()); - $this->eventMapper->update($event); - - return $event; - } - - /** - * Delete the previously created entry from the database. - * - * @depends testUpdate - * @param Event $event - */ - public function testDelete(Event $event) { - $this->eventMapper->delete($event); - } -} diff --git a/tests/Unit/Db/NotificationMapperTest.php b/tests/Unit/Db/NotificationMapperTest.php deleted file mode 100644 index 96d67226..00000000 --- a/tests/Unit/Db/NotificationMapperTest.php +++ /dev/null @@ -1,97 +0,0 @@ -<?php -/** - * @copyright Copyright (c) 2017 Kai Schröer <git@schroeer.co> - * - * @author Kai Schröer <git@schroeer.co> - * - * @license GNU AGPL version 3 or any later version - * - * 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 <http://www.gnu.org/licenses/>. - * - */ - -namespace OCA\Polls\Tests\Unit\Db; - -use OCA\Polls\Db\Event; -use OCA\Polls\Db\EventMapper; -use OCA\Polls\Db\Notification; -use OCA\Polls\Db\NotificationMapper; -use OCA\Polls\Tests\Unit\UnitTestCase; -use OCP\IDBConnection; -use League\FactoryMuffin\Faker\Facade as Faker; - -class NotificationMapperTest extends UnitTestCase { - - /** @var IDBConnection */ - private $con; - /** @var NotificationMapper */ - private $notificationMapper; - /** @var EventMapper */ - private $eventMapper; - - /** - * {@inheritDoc} - */ - public function setUp() { - parent::setUp(); - $this->con = \OC::$server->getDatabaseConnection(); - $this->notificationMapper = new NotificationMapper($this->con); - $this->eventMapper = new EventMapper($this->con); - } - - /** - * Create some fake data and persist them to the database. - * - * @return Notification - */ - public function testCreate() { - /** @var Event $event */ - $event = $this->fm->instance('OCA\Polls\Db\Event'); - $this->assertInstanceOf(Event::class, $this->eventMapper->insert($event)); - - /** @var Notification $notification */ - $notification = $this->fm->instance('OCA\Polls\Db\Notification'); - $notification->setPollId($event->getId()); - $this->assertInstanceOf(Notification::class, $this->notificationMapper->insert($notification)); - - return $notification; - } - - /** - * Update the previously created entry and persist the changes. - * - * @depends testCreate - * @param Notification $notification - * @return Notification - */ - public function testUpdate(Notification $notification) { - $newUserId = Faker::firstNameMale(); - $notification->setUserId($newUserId()); - $this->notificationMapper->update($notification); - - return $notification; - } - - /** - * Delete the previously created entries from the database. - * - * @depends testUpdate - * @param Notification $notification - */ - public function testDelete(Notification $notification) { - $event = $this->eventMapper->find($notification->getPollId()); - $this->notificationMapper->delete($notification); - $this->eventMapper->delete($event); - } -} diff --git a/tests/Unit/Db/ParticipationMapperTest.php b/tests/Unit/Db/ParticipationMapperTest.php deleted file mode 100644 index 365ce205..00000000 --- a/tests/Unit/Db/ParticipationMapperTest.php +++ /dev/null @@ -1,97 +0,0 @@ -<?php -/** - * @copyright Copyright (c) 2017 Kai Schröer <git@schroeer.co> - * - * @author Kai Schröer <git@schroeer.co> - * - * @license GNU AGPL version 3 or any later version - * - * 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 <http://www.gnu.org/licenses/>. - * - */ - -namespace OCA\Polls\Tests\Unit\Db; - -use OCA\Polls\Db\Event; -use OCA\Polls\Db\EventMapper; -use OCA\Polls\Db\Participation; -use OCA\Polls\Db\ParticipationMapper; -use OCA\Polls\Tests\Unit\UnitTestCase; -use OCP\IDBConnection; -use League\FactoryMuffin\Faker\Facade as Faker; - -class ParticipationMapperTest extends UnitTestCase { - - /** @var IDBConnection */ - private $con; - /** @var ParticipationMapper */ - private $participationMapper; - /** @var EventMapper */ - private $eventMapper; - - /** - * {@inheritDoc} - */ - public function setUp() { - parent::setUp(); - $this->con = \OC::$server->getDatabaseConnection(); - $this->participationMapper = new ParticipationMapper($this->con); - $this->eventMapper = new EventMapper($this->con); - } - - /** - * Create some fake data and persist them to the database. - * - * @return Participation - */ - public function testCreate() { - /** @var Event $event */ - $event = $this->fm->instance('OCA\Polls\Db\Event'); - $this->assertInstanceOf(Event::class, $this->eventMapper->insert($event)); - - /** @var Participation $participation */ - $participation = $this->fm->instance('OCA\Polls\Db\Participation'); - $participation->setPollId($event->getId()); - $this->assertInstanceOf(Participation::class, $this->participationMapper->insert($participation)); - - return $participation; - } - - /** - * Update the previously created entry and persist the changes. - * - * @depends testCreate - * @param Participation $participation - * @return Participation - */ - public function testUpdate(Participation $participation) { - $newDt = Faker::date('Y-m-d H:i:s'); - $participation->setDt($newDt()); - $this->participationMapper->update($participation); - - return $participation; - } - - /** - * Delete the previously created entries from the database. - * - * @depends testUpdate - * @param Participation $participation - */ - public function testDelete(Participation $participation) { - $event = $this->eventMapper->find($participation->getPollId()); - $this->participationMapper->delete($participation); - $this->eventMapper->delete($event); - } -} diff --git a/tests/Unit/Db/ParticipationTextMapperTest.php b/tests/Unit/Db/ParticipationTextMapperTest.php deleted file mode 100644 index 4d2f46a0..00000000 --- a/tests/Unit/Db/ParticipationTextMapperTest.php +++ /dev/null @@ -1,97 +0,0 @@ -<?php -/** - * @copyright Copyright (c) 2017 Kai Schröer <git@schroeer.co> - * - * @author Kai Schröer <git@schroeer.co> - * - * @license GNU AGPL version 3 or any later version - * - * 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 <http://www.gnu.org/licenses/>. - * - */ - -namespace OCA\Polls\Tests\Unit\Db; - -use OCA\Polls\Db\Event; -use OCA\Polls\Db\EventMapper; -use OCA\Polls\Db\ParticipationText; -use OCA\Polls\Db\ParticipationTextMapper; -use OCA\Polls\Tests\Unit\UnitTestCase; -use OCP\IDBConnection; -use League\FactoryMuffin\Faker\Facade as Faker; - -class ParticipationTextMapperTest extends UnitTestCase { - - /** @var IDBConnection */ - private $con; - /** @var ParticipationTextMapper */ - private $participationTextMapper; - /** @var EventMapper */ - private $eventMapper; - - /** - * {@inheritDoc} - */ - public function setUp() { - parent::setUp(); - $this->con = \OC::$server->getDatabaseConnection(); - $this->participationTextMapper = new ParticipationTextMapper($this->con); - $this->eventMapper = new EventMapper($this->con); - } - - /** - * Create some fake data and persist them to the database. - * - * @return ParticipationText - */ - public function testCreate() { - /** @var Event $event */ - $event = $this->fm->instance('OCA\Polls\Db\Event'); - $this->assertInstanceOf(Event::class, $this->eventMapper->insert($event)); - - /** @var ParticipationText $participationText */ - $participationText = $this->fm->instance('OCA\Polls\Db\ParticipationText'); - $participationText->setPollId($event->getId()); - $this->assertInstanceOf(ParticipationText::class, $this->participationTextMapper->insert($participationText)); - - return $participationText; - } - - /** - * Update the previously created entry and persist the changes. - * - * @depends testCreate - * @param ParticipationText $participationText - * @return ParticipationText - */ - public function testUpdate(ParticipationText $participationText) { - $newText = Faker::paragraph(); - $participationText->setText($newText()); - $this->participationTextMapper->update($participationText); - - return $participationText; - } - - /** - * Delete the previously created entries from the database. - * - * @depends testUpdate - * @param ParticipationText $participationText - */ - public function testDelete(ParticipationText $participationText) { - $event = $this->eventMapper->find($participationText->getPollId()); - $this->participationTextMapper->delete($participationText); - $this->eventMapper->delete($event); - } -} diff --git a/tests/Unit/Db/TextMapperTest.php b/tests/Unit/Db/TextMapperTest.php deleted file mode 100644 index 690ae3c6..00000000 --- a/tests/Unit/Db/TextMapperTest.php +++ /dev/null @@ -1,97 +0,0 @@ -<?php -/** - * @copyright Copyright (c) 2017 Kai Schröer <git@schroeer.co> - * - * @author Kai Schröer <git@schroeer.co> - * - * @license GNU AGPL version 3 or any later version - * - * 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 <http://www.gnu.org/licenses/>. - * - */ - -namespace OCA\Polls\Tests\Unit\Db; - -use OCA\Polls\Db\Event; -use OCA\Polls\Db\EventMapper; -use OCA\Polls\Db\Text; -use OCA\Polls\Db\TextMapper; -use OCA\Polls\Tests\Unit\UnitTestCase; -use OCP\IDBConnection; -use League\FactoryMuffin\Faker\Facade as Faker; - -class TextMapperTest extends UnitTestCase { - - /** @var IDBConnection */ - private $con; - /** @var TextMapper */ - private $textMapper; - /** @var EventMapper */ - private $eventMapper; - - /** - * {@inheritDoc} - */ - public function setUp() { - parent::setUp(); - $this->con = \OC::$server->getDatabaseConnection(); - $this->textMapper = new TextMapper($this->con); - $this->eventMapper = new EventMapper($this->con); - } - - /** - * Create some fake data and persist them to the database. - * - * @return Text - */ - public function testCreate() { - /** @var Event $event */ - $event = $this->fm->instance('OCA\Polls\Db\Event'); - $this->assertInstanceOf(Event::class, $this->eventMapper->insert($event)); - - /** @var Text $text */ - $text = $this->fm->instance('OCA\Polls\Db\Text'); - $text->setPollId($event->getId()); - $this->assertInstanceOf(Text::class, $this->textMapper->insert($text)); - - return $text; - } - - /** - * Update the previously created entry and persist the changes. - * - * @depends testCreate - * @param Text $text - * @return Text - */ - public function testUpdate(Text $text) { - $newText = Faker::paragraph(); - $text->setText($newText()); - $this->textMapper->update($text); - - return $text; - } - - /** - * Delete the previously created entries from the database. - * - * @depends testUpdate - * @param Text $text - */ - public function testDelete(Text $text) { - $event = $this->eventMapper->find($text->getPollId()); - $this->textMapper->delete($text); - $this->eventMapper->delete($event); - } -} diff --git a/tests/Unit/Factories/CommentFactory.php b/tests/Unit/Factories/CommentFactory.php deleted file mode 100644 index 3a8fb33c..00000000 --- a/tests/Unit/Factories/CommentFactory.php +++ /dev/null @@ -1,36 +0,0 @@ -<?php -/** - * @copyright Copyright (c) 2017 Kai Schröer <git@schroeer.co> - * - * @author Kai Schröer <git@schroeer.co> - * - * @license GNU AGPL version 3 or any later version - * - * 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 <http://www.gnu.org/licenses/>. - * - */ - -use League\FactoryMuffin\Faker\Facade as Faker; - -/** - * General factory for the comment model. - */ -$fm->define('OCA\Polls\Db\Comment')->setDefinitions([ - 'userId' => Faker::firstNameMale(), - 'dt' => function () { - $date = new DateTime('today'); - return $date->format('Y-m-d H:i:s'); - }, - 'comment' => Faker::paragraph() -]); diff --git a/tests/Unit/Factories/DateFactory.php b/tests/Unit/Factories/DateFactory.php deleted file mode 100644 index fc6d8fe0..00000000 --- a/tests/Unit/Factories/DateFactory.php +++ /dev/null @@ -1,32 +0,0 @@ -<?php -/** - * @copyright Copyright (c) 2017 Kai Schröer <git@schroeer.co> - * - * @author Kai Schröer <git@schroeer.co> - * - * @license GNU AGPL version 3 or any later version - * - * 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 <http://www.gnu.org/licenses/>. - * - */ - -/** - * General factory for the date model. - */ -$fm->define('OCA\Polls\Db\Date')->setDefinitions([ - 'dt' => function () { - $date = new DateTime('today'); - return $date->format('Y-m-d H:i:s'); - } -]); diff --git a/tests/Unit/Factories/EventFactory.php b/tests/Unit/Factories/EventFactory.php deleted file mode 100644 index fa32dd6c..00000000 --- a/tests/Unit/Factories/EventFactory.php +++ /dev/null @@ -1,46 +0,0 @@ -<?php -/** - * @copyright Copyright (c) 2017 Kai Schröer <git@schroeer.co> - * - * @author Kai Schröer <git@schroeer.co> - * - * @license GNU AGPL version 3 or any later version - * - * 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 <http://www.gnu.org/licenses/>. - * - */ - -use League\FactoryMuffin\Faker\Facade as Faker; - -/** - * General factory for the event model. - */ -$fm->define('OCA\Polls\Db\Event')->setDefinitions([ - 'type' => 0, - 'title' => Faker::sentence(10), - 'description' => Faker::paragraph(), - 'owner' => Faker::firstNameMale(), - 'created' => function () { - $date = new DateTime('today'); - return $date->format('Y-m-d H:i:s'); - }, - 'access' => 'registered', - 'expire' => function () { - $date = new DateTime('tomorrow'); - return $date->format('Y-m-d H:i:s'); - }, - 'hash' => Faker::regexify('[A-Za-z0-9]{16}'), - 'isAnonymous' => 0, - 'fullAnonymous' => 0 -]); diff --git a/tests/Unit/Factories/NotificationFactory.php b/tests/Unit/Factories/NotificationFactory.php deleted file mode 100644 index 3416219d..00000000 --- a/tests/Unit/Factories/NotificationFactory.php +++ /dev/null @@ -1,31 +0,0 @@ -<?php -/** - * @copyright Copyright (c) 2017 Kai Schröer <git@schroeer.co> - * - * @author Kai Schröer <git@schroeer.co> - * - * @license GNU AGPL version 3 or any later version - * - * 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 <http://www.gnu.org/licenses/>. - * - */ - -use League\FactoryMuffin\Faker\Facade as Faker; - -/** - * General factory for the notification model. - */ -$fm->define('OCA\Polls\Db\Notification')->setDefinitions([ - 'userId' => Faker::firstNameMale(), -]); diff --git a/tests/Unit/Factories/ParticipationFactory.php b/tests/Unit/Factories/ParticipationFactory.php deleted file mode 100644 index 1d178dd4..00000000 --- a/tests/Unit/Factories/ParticipationFactory.php +++ /dev/null @@ -1,36 +0,0 @@ -<?php -/** - * @copyright Copyright (c) 2017 Kai Schröer <git@schroeer.co> - * - * @author Kai Schröer <git@schroeer.co> - * - * @license GNU AGPL version 3 or any later version - * - * 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 <http://www.gnu.org/licenses/>. - * - */ - -use League\FactoryMuffin\Faker\Facade as Faker; - -/** - * General factory for the participation model. - */ -$fm->define('OCA\Polls\Db\Participation')->setDefinitions([ - 'userId' => Faker::firstNameMale(), - 'dt' => function () { - $date = new DateTime('today'); - return $date->format('Y-m-d H:i:s'); - }, - 'type' => 0 -]); diff --git a/tests/Unit/Factories/ParticipationTextFactory.php b/tests/Unit/Factories/ParticipationTextFactory.php deleted file mode 100644 index 7b6f16f4..00000000 --- a/tests/Unit/Factories/ParticipationTextFactory.php +++ /dev/null @@ -1,33 +0,0 @@ -<?php -/** - * @copyright Copyright (c) 2017 Kai Schröer <git@schroeer.co> - * - * @author Kai Schröer <git@schroeer.co> - * - * @license GNU AGPL version 3 or any later version - * - * 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 <http://www.gnu.org/licenses/>. - * - */ - -use League\FactoryMuffin\Faker\Facade as Faker; - -/** - * General factory for the participation text model. - */ -$fm->define('OCA\Polls\Db\ParticipationText')->setDefinitions([ - 'text' => Faker::paragraph(), - 'userId' => Faker::firstNameMale(), - 'type' => 0 -]); diff --git a/tests/Unit/Factories/TextFactory.php b/tests/Unit/Factories/TextFactory.php deleted file mode 100644 index 91702af7..00000000 --- a/tests/Unit/Factories/TextFactory.php +++ /dev/null @@ -1,31 +0,0 @@ -<?php -/** - * @copyright Copyright (c) 2017 Kai Schröer <git@schroeer.co> - * - * @author Kai Schröer <git@schroeer.co> - * - * @license GNU AGPL version 3 or any later version - * - * 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 <http://www.gnu.org/licenses/>. - * - */ - -use League\FactoryMuffin\Faker\Facade as Faker; - -/** - * General factory for the text model. - */ -$fm->define('OCA\Polls\Db\Text')->setDefinitions([ - 'text' => Faker::paragraph() -]); diff --git a/tests/Unit/UnitTestCase.php b/tests/Unit/UnitTestCase.php deleted file mode 100644 index 7469aff1..00000000 --- a/tests/Unit/UnitTestCase.php +++ /dev/null @@ -1,42 +0,0 @@ -<?php -/** - * @copyright Copyright (c) 2017 Kai Schröer <git@schroeer.co> - * - * @author Kai Schröer <git@schroeer.co> - * - * @license GNU AGPL version 3 or any later version - * - * 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 <http://www.gnu.org/licenses/>. - * - */ - -namespace OCA\Polls\Tests\Unit; - -use League\FactoryMuffin\FactoryMuffin; -use PHPUnit_Framework_TestCase; - -abstract class UnitTestCase extends PHPUnit_Framework_TestCase { - - /** @var FactoryMuffin */ - protected $fm; - - /** - * {@inheritDoc} - */ - public function setUp() { - parent::setUp(); - $this->fm = new FactoryMuffin(); - $this->fm->loadFactories(__DIR__ . '/Factories'); - } -} diff --git a/tests/bootstrap.php b/tests/bootstrap.php index f840332b..64fc285e 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -1,8 +1,8 @@ <?php /** - * @copyright Copyright (c) 2017 Kai Schröer <git@schroeer.co> + * @copyright Copyright (c) 2017 Vinzenz Rosenkranz <vinzenz.rosenkranz@gmail.com> * - * @author Kai Schröer <git@schroeer.co> + * @author Kai Schröer <kai@schroeer.co> * * @license GNU AGPL version 3 or any later version * @@ -25,14 +25,16 @@ if (!defined('PHPUNIT_RUN')) { define('PHPUNIT_RUN', 1); } -require_once __DIR__ . '/../../../lib/base.php'; -require_once __DIR__ . '/../vendor/autoload.php'; +require_once(__DIR__.'/../../../lib/base.php'); +// Fix for "Autoload path not allowed: .../tests/lib/testcase.php" \OC::$loader->addValidRoot(OC::$SERVERROOT . '/tests'); + +// Fix for "Autoload path not allowed: .../polls/tests/testcase.php" \OC_App::loadApp('polls'); if (!class_exists('PHPUnit_Framework_TestCase')) { - require_once 'PHPUnit/Autoload.php'; + require_once('PHPUnit/Autoload.php'); } -\OC_Hook::clear(); +OC_Hook::clear(); |
