Kaydet (Commit) a4440671 authored tarafından Laurent Balland-Poirier's avatar Laurent Balland-Poirier Kaydeden (comit) Caolán McNamara

fdo#79597 Password UI: correct typo for 1 character

Display a different string in case of 1 character for minimum length

Change-Id: Iba2fbbb7d4101718def7c79ce5354debf5d97041
Reviewed-on: https://gerrit.libreoffice.org/9631Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst e3a2585c
...@@ -61,6 +61,7 @@ private: ...@@ -61,6 +61,7 @@ private:
OKButton* mpOKBtn; OKButton* mpOKBtn;
OUString maMinLenPwdStr; OUString maMinLenPwdStr;
OUString maMinLenPwdStr1;
OUString maEmptyPwdStr; OUString maEmptyPwdStr;
OUString maMainPwdStr; OUString maMainPwdStr;
sal_uInt16 mnMinLen; sal_uInt16 mnMinLen;
......
...@@ -155,6 +155,7 @@ ...@@ -155,6 +155,7 @@
#define STR_PASSWD_MIN_LEN (RID_SFX_START+124) #define STR_PASSWD_MIN_LEN (RID_SFX_START+124)
#define STR_NONCHECKEDOUT_DOCUMENT (RID_SFX_START+125) #define STR_NONCHECKEDOUT_DOCUMENT (RID_SFX_START+125)
#define BT_CHECKOUT (RID_SFX_START+126) #define BT_CHECKOUT (RID_SFX_START+126)
#define STR_PASSWD_MIN_LEN1 (RID_SFX_START+127)
#define STR_ACCTITLE_PRODUCTIVITYTOOLS (RID_SFX_START+157) #define STR_ACCTITLE_PRODUCTIVITYTOOLS (RID_SFX_START+157)
#define SFX_THUMBNAIL_TEXT (RID_SFX_START+158) #define SFX_THUMBNAIL_TEXT (RID_SFX_START+158)
......
...@@ -29,6 +29,11 @@ String STR_PASSWD_MIN_LEN ...@@ -29,6 +29,11 @@ String STR_PASSWD_MIN_LEN
Text [ en-US ] = "(Minimum $(MINLEN) characters)" ; Text [ en-US ] = "(Minimum $(MINLEN) characters)" ;
}; };
String STR_PASSWD_MIN_LEN1
{
Text [ en-US ] = "(Minimum 1 character)" ;
};
String STR_PASSWD_EMPTY String STR_PASSWD_EMPTY
{ {
Text [ en-US ] = "(The password can be empty)" ; Text [ en-US ] = "(The password can be empty)" ;
......
...@@ -86,6 +86,7 @@ IMPL_LINK_NOARG(SfxPasswordDialog, OKHdl) ...@@ -86,6 +86,7 @@ IMPL_LINK_NOARG(SfxPasswordDialog, OKHdl)
SfxPasswordDialog::SfxPasswordDialog(Window* pParent, const OUString* pGroupText) SfxPasswordDialog::SfxPasswordDialog(Window* pParent, const OUString* pGroupText)
: ModalDialog(pParent, "PasswordDialog", "sfx/ui/password.ui") : ModalDialog(pParent, "PasswordDialog", "sfx/ui/password.ui")
, maMinLenPwdStr(SFX2_RESSTR(STR_PASSWD_MIN_LEN)) , maMinLenPwdStr(SFX2_RESSTR(STR_PASSWD_MIN_LEN))
, maMinLenPwdStr1(SFX2_RESSTR(STR_PASSWD_MIN_LEN1))
, maEmptyPwdStr(SFX2_RESSTR(STR_PASSWD_EMPTY)) , maEmptyPwdStr(SFX2_RESSTR(STR_PASSWD_EMPTY))
, mnMinLen(5) , mnMinLen(5)
, mnExtras(0) , mnExtras(0)
...@@ -133,9 +134,14 @@ void SfxPasswordDialog::SetPasswdText( ) ...@@ -133,9 +134,14 @@ void SfxPasswordDialog::SetPasswdText( )
mpMinLengthFT->SetText(maEmptyPwdStr); mpMinLengthFT->SetText(maEmptyPwdStr);
else else
{ {
maMainPwdStr = maMinLenPwdStr; if( mnMinLen == 1 )
maMainPwdStr = maMainPwdStr.replaceAll( "$(MINLEN)", OUString::number((sal_Int32) mnMinLen ) ); mpMinLengthFT->SetText(maMinLenPwdStr1);
mpMinLengthFT->SetText(maMainPwdStr); else
{
maMainPwdStr = maMinLenPwdStr;
maMainPwdStr = maMainPwdStr.replaceAll( "$(MINLEN)", OUString::number((sal_Int32) mnMinLen ) );
mpMinLengthFT->SetText(maMainPwdStr);
}
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment