Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Stable10] Add UI for switching public mail notification language #32004

Merged
merged 3 commits into from
Jul 23, 2018
Merged

[Stable10] Add UI for switching public mail notification language #32004

merged 3 commits into from
Jul 23, 2018

Conversation

VicDeo
Copy link
Member

@VicDeo VicDeo commented Jul 6, 2018

Backport of #31869

Description

  • Make lang selector reusable
  • Reuse it for a new option in the Sharing section

Related Issue

https://github.com/owncloud/enterprise/issues/2435#issuecomment-396551153

Motivation and Context

Allows admin users change a language used for public mail notifications

How Has This Been Tested?

  1. Language selector in Settings->Personal -> General -> Language should NOT change it's behavior

  2. A new option should be visible only when Allow users to send mail notification for shared files is checked in Settings->Admin->Sharing

  3. Switching the dropdown to the value Owner language should reset to the current behavior when the notification is sent in the language of the file owner
    expected:
    php occ config:app:get core shareapi_public_notification_lang produces an empty output in this case (no value set)

  4. Switching the dropdown to any other value except Owner language should update shareapi_public_notification_lang with a respective language code

Screenshots (if appropriate):

notification lang

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

  • My code follows the code style of this project.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes.
  • All new and existing tests passed.

@VicDeo VicDeo added this to the development milestone Jul 6, 2018
@VicDeo VicDeo self-assigned this Jul 6, 2018
@VicDeo VicDeo force-pushed the stable10-language-selector branch from b6f19f4 to 616e1ea Compare July 6, 2018 14:18
@codecov
Copy link

codecov bot commented Jul 6, 2018 •
edited
Loading

Codecov Report

Merging #32004 into stable10 will increase coverage by 0.05%.
The diff coverage is 97.7%.

Impacted file tree graph

@@              Coverage Diff               @@
##             stable10   #32004      +/-   ##
==============================================
+ Coverage       62.68%   62.73%   +0.05%     
+ Complexity      18688    18687       -1     
==============================================
  Files            1215     1217       +2     
  Lines           73262    73296      +34     
  Branches         1276     1276              
==============================================
+ Hits            45923    45982      +59     
+ Misses          26960    26935      -25     
  Partials          379      379
Flag Coverage Δ Complexity Δ
#javascript 52.83% <ø> (ø) 0 <ø> (ø) ⬇️
#phpunit 63.81% <97.7%> (+0.05%) 18687 <15> (-1) ⬇️
Impacted Files Coverage Δ Complexity Δ
settings/Application.php 51.44% <ø> (+1.71%) 3 <0> (ø) ⬇️
settings/templates/panels/personal/profile.php 60% <100%> (+1.37%) 0 <0> (ø) ⬇️
settings/Panels/Personal/Profile.php 100% <100%> (+29.82%) 4 <0> (-17) ⬇️
lib/private/Helper/LocaleHelper.php 100% <100%> (ø) 15 <15> (?)
settings/templates/language.php 100% <100%> (ø) 0 <0> (?)
lib/private/Settings/SettingsManager.php 73.07% <100%> (+0.17%) 44 <0> (ø) ⬇️
settings/templates/panels/admin/filesharing.php 19.04% <50%> (+1.54%) 0 <0> (ø) ⬇️
settings/Panels/Admin/FileSharing.php 98.52% <95.45%> (-1.48%) 7 <0> (+1)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 85f8be5...24da27d. Read the comment docs.

@VicDeo VicDeo mentioned this pull request Jul 6, 2018
Merged
11 tasks
@VicDeo VicDeo requested a review from PVince81 July 6, 2018 14:20
PVince81
PVince81 approved these changes Jul 6, 2018
View reviewed changes
Copy link
Contributor

@PVince81 PVince81 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@VicDeo
Copy link
Member Author

VicDeo commented Jul 9, 2018

Note: b669a73 won't pass CI without backporting translations from master

@DeepDiver1975
Copy link
Member

Note: b669a73 won't pass CI without backporting translations from master

we will backport them asap

@PVince81
Copy link
Contributor

PVince81 commented Jul 9, 2018

is b669a73 on master as well ? please link to PR

@VicDeo
Copy link
Member Author

VicDeo commented Jul 9, 2018

#32015

@DeepDiver1975 DeepDiver1975 mentioned this pull request Jul 9, 2018
Closed
8 tasks
@DeepDiver1975
Copy link
Member

@ownclouders rebase

@ownclouders
Copy link
Contributor

Hey! I'm GitMate.io! This pull request is being rebased automatically. Please DO NOT push while rebase is in progress or your changes would be lost permanently ⚠️

@ownclouders ownclouders force-pushed the stable10-language-selector branch from b669a73 to 56f698a Compare July 18, 2018 06:52
@ownclouders
Copy link
Contributor

Automated rebase with GitMate.io was successful! 🎉

@VicDeo
Copy link
Member Author

VicDeo commented Jul 20, 2018

@ownclouders rebase

@ownclouders
Copy link
Contributor

Hey! I'm GitMate.io! This pull request is being rebased automatically. Please DO NOT push while rebase is in progress or your changes would be lost permanently ⚠️

@ownclouders ownclouders force-pushed the stable10-language-selector branch from 56f698a to dfa7c57 Compare July 20, 2018 12:37
@ownclouders
Copy link
Contributor

Automated rebase with GitMate.io was successful! 🎉

@PVince81
Copy link
Contributor

uh oh, conflicts

@VicDeo VicDeo force-pushed the stable10-language-selector branch from dfa7c57 to 24da27d Compare July 23, 2018 13:05
@VicDeo
Copy link
Member Author

VicDeo commented Jul 23, 2018

conflicts have been resolved

@PVince81 PVince81 merged commit 245dc73 into stable10 Jul 23, 2018
@PVince81 PVince81 deleted the stable10-language-selector branch July 23, 2018 15:21
@PVince81 PVince81 modified the milestones: development, QA Sep 5, 2018
@lock lock bot locked as resolved and limited conversation to collaborators Sep 5, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@PVince81 PVince81 PVince81 approved these changes

Assignees

@VicDeo VicDeo

Labels
4 - To release feature:sharing
Projects
None yet
Milestone
10.0.10
Development

Successfully merging this pull request may close these issues.
4 participants
@VicDeo @DeepDiver1975 @PVince81 @ownclouders