Sommerfest

projectforge-business/src/main/java/org/projectforge/mail/MailAccount.java

@@ -35,7 +35,7 @@
 
 /**
  * Connects to a mail server and receives mails.
- * 
+ *
  * @author Kai Reinhard ([email protected])
  */
 public class MailAccount
@@ -75,7 +75,7 @@ public MailAccount(Store store, Folder folder)
 
   /**
    * Gets a list of all Emails matching the given filter.
-   * 
+   *
    * @return ArrayList of all found Email.
    */
   public Mail[] getMails(final MailFilter filter)
@@ -134,7 +134,7 @@ public Mail[] getMails(final MailFilter filter)
 
   /**
    * Opens the connection to the mailserver. Don't forget to call disconnect if this method returns true!
-   * 
+   *
    * @param mbox The folder name to open. If null then the default folder will be opened.
    * @param readwrite If false then the mbox is connected in readonly mode.
    * @return true on success, otherwise false.
@@ -207,7 +207,7 @@ public Mail[] getMails(final MailFilter filter)
 
   /**
    * Disconnects the folder and store if given and is opened yet.
-   * 
+   *
    * @return
    */
   //  @Deprecated
@@ -360,4 +360,4 @@ private void getContent(final Part msg, final StringBuffer buf) throws Messaging
       }
     }
   }
-}
+}

projectforge-business/src/main/kotlin/org/projectforge/business/poll/PollDO.kt

@@ -28,6 +28,8 @@ import org.projectforge.business.poll.filter.PollAssignment
 import org.projectforge.business.poll.filter.PollState
 import org.projectforge.common.StringHelper
 import org.projectforge.common.anots.PropertyInfo
+import org.projectforge.framework.i18n.translate
+import org.projectforge.framework.i18n.translateMsg
 import org.projectforge.framework.persistence.api.AUserRightId
 import org.projectforge.framework.persistence.entities.DefaultBaseDO
 import org.projectforge.framework.persistence.user.api.ThreadLocalUserContext

projectforge-business/src/main/resources/I18nResources.properties

@@ -25,7 +25,6 @@ ibanvalidator.wronglength.de=The field ''${label}'' starts with ''DE'', but a ge
 # Currency format
 currencyConverter.percentage.help=You can enter amounts as well as percent values (e. g. 10%).
 currencyFormat={0,number,,##0.00}
-
 # Not internationalized properties:
 exception.notYetSupported=Not yet supported.
 menu.adminGuide=Administration guide
@@ -100,6 +99,9 @@ uptodate=up-to-date
 wizard=Wizard
 
 # Common
+location=Location
+no=No
+yes=Yes
 akquise=Acquisition
 changes=Changes
 charactersLeft=characters left.
@@ -187,7 +189,6 @@ moreEntriesAvailable=More entries available.
 name=Name
 new=New
 nickname=Nickname
-no=No
 notEnded=not ended
 nothingFound=Nothing found.
 notLoggedIn=Not logged in.
@@ -281,7 +282,6 @@ username=User name
 value=Value
 values=Values
 weekOfYear=Week of year
-yes=Yes
 
 access=Accessright
 access.accessTable=Access table
@@ -1402,7 +1402,7 @@ history.was=was
 hr.planning.description=Activity report
 hr.planning.entry.copyFromPredecessor=Copy from predecessor
 hr.planning.entry.error.entryDoesAlreadyExistForUserAndWeekOfYear=An entry with the same user and week of year does already exist.
-hr.planning.entry.error.noRightForProject=You don''t have permissions to create or edit entries for the project ''{0}''. 
+hr.planning.entry.error.noRightForProject=You don''t have permissions to create or edit entries for the project ''{0}''.
 hr.planning.entry.error.statusAndProjektNotAllowed=Status and project not allowed.
 hr.planning.entry.error.statusOrProjektRequired=Status or project required.
 hr.planning.entry.status.absence=absence
@@ -1833,7 +1833,7 @@ plugins.teamcal.event.changedby=Changed by
 plugins.teamcal.event.convert2Timesheet=Convert to time-sheet
 plugins.teamcal.event.decline=decline
 plugins.teamcal.event.deletedby=Deleted by
-plugins.teamcal.event.duplicatedUidFromDifferentUser=An event from a another user with UID {0} already exists in calendar {1}. 
+plugins.teamcal.event.duplicatedUidFromDifferentUser=An event from a another user with UID {0} already exists in calendar {1}.
 plugins.teamcal.event.duration=Duration
 plugins.teamcal.event.duration.error=Duration error. Please check start and end date.
 plugins.teamcal.event.endDate=End
@@ -1975,11 +1975,13 @@ plugins.teamcal.title.add=Add calendar
 plugins.teamcal.title.edit=Edit team calendar
 plugins.teamcal.title.heading=Calendar
 plugins.teamcal.title.list=List of calendars
-
 # poll plugin
+TextQuestion=Text Question
+SingleResponseQuestion=Single Response Question
+MultiResponseQuestion=Multiple Choice Question
 poll=Poll
 poll.access=Access
-poll.answer=Answer
+poll.answer=Option
 poll.assignment=Assignment
 poll.attendee=Attendee
 poll.attendees=Attendees
@@ -1990,10 +1992,11 @@ poll.confirmation.creation=Do you really want to create the poll? You won't be a
 Also make sure to add attendees for your poll.
 poll.confirmation.deleteAnswer=Do you really want to delete this answer?
 poll.confirmation.deleteQuestion=Do you really want to delete this question?
+poll.confirmation.deleteButton=Yes
 poll.confirmation.finish=Do you really want to finish this Poll?
 poll.date=Date
 poll.deadline=Deadline
-poll.delegationAnswers=Answers of 
+poll.delegationAnswers=Answers of
 poll.description=Description
 poll.error.oneQuestionRequired=At least one question is required.
 poll.exception.noAttendee=This user is not part of the poll.
@@ -2005,18 +2008,36 @@ poll.groupAttendees=Attendee Groups
 poll.guide=Poll Guide
 poll.infopage=Info Page
 poll.location=Location
-poll.mail.ended.content=<p>Dear Attendees,</p>\
-<p>We wanted to let you know that the poll "{0}" created by {1} has now ended. Thank you to everyone who participated and provided valuable input.</p>\
-<p>If you missed the deadline to submit your responses, we encourage you to still share your thoughts with us. While we may not be able to include your responses in the official results, your feedback is still valuable for future polls.</p>\
-<p>Thank you again for your participation.</p>\
-<p>Best regards,</p>\
-<p>{1}</p>
-poll.mail.ended.subject=Poll ended
-poll.mail.endingSoon.content=<p>Dear Attendees,</p>\
-<p>This is a friendly reminder that the poll "{0}" created by {1} is ending soon, on {2}. Please make sure to submit your responses before the deadline.</p>\
-<p>If you have not yet had a chance to participate, please take a few moments to do so before the poll closes. Your input is important and valued.</p>\
-<p><a>{3}</a></p>\
-<p>Thank you for your attention, and have a great day!</p>\
+poll.mail.ended.fullAccess.subject=The survey titled "{0}" has ended
+poll.mail.ended.fullAccess.content=This email is for all full-access users. Attached is the Excel spreadsheet containing the survey results.
+poll.annotations.description=In the annotation field, you can add information that you believe is not clearly defined in the responses or if you wish to provide important information, such as allergies.
+poll.email-subject-tooltip=Here you can choose the subject of the email yourself. Use {0} to insert the survey title and {1} to set the automatic end date of the survey - which is the deadline for voting. \
+poll.email-content-tooltip=Here you can determine the content of the email yourself. Use {0} to call the survey title. With {1}, you can display the survey creator, with {2} you create a direct link to the survey.\
+  \ Use {3} to retrieve the survey description, and {4} to automatically retrieve the end date of the survey, i.e., the deadline for voting.
+poll.fullAccessUser.tooltip=Full access users have the ability to close the survey, view the Excel results, and add or remove individuals (they cannot remove themselves). They are not counted as participants.\
+  \ If these individuals are also supposed to vote, they must be additionally registered as participants.
+poll.fullAccessgroups.tooltip=Full access groups include, for example, the BUs, the MUK team, or the Marketing team. Individuals with full access can close the survey prematurely, view the Excel results, or add users. \
+  If these individuals are supposed to vote, they must be added as participants.
+poll.attendees.tooltip=Attendees can only vote.
+poll.groupAttendees.tooltip=Group attendees are a convenient way to add entire groups, such as BUs, all at once instead of individually. Attendees can only vote.
+poll.premadeQuestion.tooltip=In this menu, you will find frequently used templates that help you create the survey quickly. If questions are missing in the template, you can also add them. Additionally,\
+  \ you have the option to revise or correct questions if they do not apply to your situation in the template.
+poll.questionType.tooltip=Question types offer various options for questions, including single-choice questions, multiple-choice questions, and text questions. You can easily add them if a question is missing\
+  \ in the template or if you want to create your own survey without using a template.
+annotations=Annotations
+email-content-field=Email Content
+email-subject-field=Email Subject
+poll.premade.template=Add Template
+poll.questionTemplate=Templates
+poll.templateTypeNeujahrsfeier=New Year's Party
+poll.templateTypeSommerfest=Summer Party
+poll.templateTypeTeamessen=Team Dinner
+poll.mail.ended.subject=The survey titled "{0}" has ended
+poll.mail.ended.content=<p>Dear participants,</p>\
+<p>We would like to inform you that the survey "{0}", created by {1}, has now ended. Thank you to all who participated.</p>\
+<p>You can still view your results/answers, but you can no longer edit them.</p>\
+<p>If you forgot to vote or perhaps want to make some changes, please contact an authorized person or the creator, in this case "{1}".</p>\
+<br>\
 <p>Best regards,</p>\
 <p>{1}</p>
 poll.mail.endingSoon.subject=Poll ending in {0} days
@@ -2036,8 +2057,19 @@ poll.other=Other
 poll.owner=Owner
 poll.popup.closed=The poll was already closed.
 poll.question=Question
-poll.question.textQuestion=Text Question
 poll.questionType=Question Type
+poll.questionType.TextQuestion=Text Question
+poll.questionType.SingleResponseQuestion=Single response Question
+poll.questionType.MultiResponseQuestion=Multiple Choice Questions
+poll.question.texttitle= Text Questions
+poll.question.singletitel= Singel response Question
+poll.question.multititle= Multiple Choice Questions
+poll.question.text=Question
+poll.question.single=Question
+poll.question.multi=Question
+poll.question.TextQuestion=Answer
+poll.question.SingleResponseQuestion=Question
+poll.question.MultiResponseQuestion=Question
 poll.respond=Send responses
 poll.response.mail.update.content=<p>Dear {0},</p>\
 <p>I wanted to inform you that Person {2} has updated their answer to Poll {1}.</p>\
@@ -2346,7 +2378,7 @@ timesheet.stopTime=Stop time
 timesheet.tag=Tag
 timesheet.taskReference=Reference of element
 timesheet.templates=Templates
-timesheet.templates.migrationOfLegacy.button=Old templates  
+timesheet.templates.migrationOfLegacy.button=Old templates
 timesheet.templates.migrationOfLegacy.confirmationMessage=Do you want to import your old templates from the classical version now? Any existing entry will not be overwritten.
 timesheet.templates.migrationOfLegacy.tooltip=Imports old templates of classical version.
 timesheet.templates.new=New template
@@ -2662,7 +2694,6 @@ webauthn.registration.button.authenticate=WebAuthn
 webauthn.registration.button.authenticate.info=You may use any of your registered WebAuthn tokens here (for example Yubikey).
 webauthn.registration.button.register=Register
 webauthn.title=WebAuthn (Fido2 etc.)
-
 # (timeable) attributes
 attr.deletemodal.heading=Would you like to delete this entry?
 attr.deletemodal.question=<b>Yes:</b> This entry will be deleted and all changes on this page will be saved.<br><b>Cancel:</b> This entry will not be deleted and you stay on this page.
@@ -2672,7 +2703,6 @@ attr.savemodal.question=<b>Yes:</b> All changes on this page will be saved.<br><
 attr.starttime.alreadyexists.day=There is already an entry with the same date (Day).
 attr.starttime.alreadyexists.month=There is already an entry with the same date (Month).
 attr.validFrom=Valid from
-
 birthdayButler.email.content=In the month of {0}, {1} employees are celebrating their birthdays. Attached, you will find the list of birthdays.
 birthdayButler.email.content.noBirthdaysFound=No birthday entries were found in the month of {0}.
 birthdayButler.email.opening=New month, new birthday list!
@@ -2681,4 +2711,4 @@ birthdayButler.month.response.noEntry=There are no birthday entries for this mon
 birthdayButler.month.response.nothingSelected=The month is required.
 birthdayButler.organization.noMatchingUser=There are no users assigned to the organization configured in projectforge.properties.
 birthdayButler.organization.notSet=No organization is defined in the application.properties. -> projectforge.birthdayButler.organization=Your Organization
-birthdayButler.wordDocument.error=Error while creating the Word document.
+birthdayButler.wordDocument.error=Error while creating the Word document.