fix: Enhance update status message for valid subscriptions #9354
Conversation
### Motivation - Inform users in the General Settings info box that the update channel cannot be changed when connected to enterprise systems so the status reflects the hidden channel selector. ### Description - Append an enterprise subscription notice to the updater status text in `GeneralSettings::slotUpdateInfo` in `src/gui/generalsettings.cpp` for `OCUpdater` using an HTML line break when the status is HTML. - Do the same for `SparkleUpdater`, choosing a separator based on `Qt::mightBeRichText` so the message works for both rich-text and plain-text status strings. Signed-off-by: Rello <Rello@users.noreply.github.com>
|
non-enterprise: 
enterprise: 
|
Signed-off-by: Rello <Rello@users.noreply.github.com>
Signed-off-by: Rello <Rello@users.noreply.github.com>
There was a problem hiding this comment.
I mean, the wording makes sense from my side, but is this localized correctly? Eg. doesn't the localized string include the newline and the substitution here?
Edit: Right wait, that is the point. But duplicating the string with <br/> and \n seems bad?
Not even sure it needs to be in parentheses and separated by a newline and whatnot. Just Connected to an enterprise system. Update channel (%1) cannot be changed. would make sense to me.
Signed-off-by: Rello <Rello@users.noreply.github.com>
|
@kra-mo |
Rello
requested review from
Aiiaiiio,
camilasan,
i2h3 and
nilsding
as code owners
|
Artifact containing the AppImage: nextcloud-appimage-pr-9354.zip Digest: To test this change/fix you can download the above artifact file, unzip it, and run it. Please make sure to quit your existing Nextcloud app and backup your data. |
|
Motivation
Description
GeneralSettings::slotUpdateInfoinsrc/gui/generalsettings.cppforOCUpdaterusing an HTML line break when the status is HTML.SparkleUpdater, choosing a separator based onQt::mightBeRichTextso the message works for both rich-text and plain-text status strings.