Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
mobile Datovka
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
14
Issues
14
List
Boards
Labels
Service Desk
Milestones
Merge Requests
4
Merge Requests
4
Operations
Operations
Incidents
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Datovka projects
mobile Datovka
Commits
f1cfc191
Commit
f1cfc191
authored
Nov 16, 2018
by
Karel Slaný
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updated Czech localisation.
parent
ad6e271b
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
603 additions
and
432 deletions
+603
-432
res/locale/datovka_cs.ts
res/locale/datovka_cs.ts
+297
-212
res/locale/datovka_en.ts
res/locale/datovka_en.ts
+292
-207
src/accounts.cpp
src/accounts.cpp
+13
-12
src/net/isds_wrapper.cpp
src/net/isds_wrapper.cpp
+1
-1
No files found.
res/locale/datovka_cs.ts
View file @
f1cfc191
This diff is collapsed.
Click to expand it.
res/locale/datovka_en.ts
View file @
f1cfc191
This diff is collapsed.
Click to expand it.
src/accounts.cpp
View file @
f1cfc191
...
...
@@ -178,12 +178,12 @@ bool Accounts::createAccount(const QVariant &acntModelVariant,
}
if
(
newUserName
.
isEmpty
()
||
acntName
.
isEmpty
()
||
pwd
.
isEmpty
())
{
errTxt
=
tr
(
"User
name, password or account name has not been specified. These fields must be filled in
"
);
errTxt
=
tr
(
"User
name, password or account name has not been specified. These fields must be filled in.
"
);
goto
fail
;
}
if
(
!
usernameCorrectLength
(
newUserName
))
{
errTxt
=
tr
(
"User
name '%1' has wrong length."
).
arg
(
newUserName
);
errTxt
=
tr
(
"Username '%1' has wrong length."
).
arg
(
newUserName
);
goto
fail
;
}
...
...
@@ -197,7 +197,7 @@ bool Accounts::createAccount(const QVariant &acntModelVariant,
acntData
.
setCertPath
(
certPath
);
if
(
accountModel
->
addAccount
(
acntData
)
==
AccountListModel
::
AA_EXISTS
)
{
errTxt
=
tr
(
"Account with user
name '%1' already exists."
).
arg
(
newUserName
);
errTxt
=
tr
(
"Account with username '%1' already exists."
).
arg
(
newUserName
);
goto
fail
;
}
...
...
@@ -440,7 +440,8 @@ bool Accounts::prepareChangeUserName(const QVariant &acntModelVariant,
/* Show confirm dialogue about use name changing */
int
msgResponse
=
Dialogues
::
message
(
Dialogues
::
QUESTION
,
tr
(
"Change user name: %1"
).
arg
(
oldUserName
),
tr
(
"Do you want to change user name from '%1' to '%2' of account '%3'?"
).
arg
(
oldUserName
).
arg
(
newUserName
).
arg
(
acntName
),
tr
(
"Do you want to change the username from '%1' to '%2' for the account '%3'?"
)
.
arg
(
oldUserName
).
arg
(
newUserName
).
arg
(
acntName
),
tr
(
"Note: It will also change all related local database names and account information."
),
Dialogues
::
NO
|
Dialogues
::
YES
,
Dialogues
::
NO
);
if
(
msgResponse
==
Dialogues
::
NO
)
{
...
...
@@ -488,7 +489,7 @@ bool changeFileDbName(const QString &oldUserName,
FileDb
*
fDb
=
GlobInstcs
::
fileDbsPtr
->
accessFileDb
(
GlobInstcs
::
setPtr
->
dbsLocation
,
oldUserName
,
storeToDisk
);
if
(
Q_UNLIKELY
(
fDb
==
Q_NULLPTR
))
{
errTxt
=
Accounts
::
tr
(
"Cannot access file database for the user
name '%1'."
)
errTxt
=
Accounts
::
tr
(
"Cannot access file database for the username '%1'."
)
.
arg
(
oldUserName
);
return
false
;
}
...
...
@@ -497,7 +498,7 @@ bool changeFileDbName(const QString &oldUserName,
QString
currentDbFileName
=
fDb
->
fileName
();
currentDbFileName
.
replace
(
oldUserName
,
newUserName
);
if
(
!
fDb
->
moveDb
(
currentDbFileName
))
{
errTxt
=
Accounts
::
tr
(
"Cannot change file database
on the user
name '%1'."
)
errTxt
=
Accounts
::
tr
(
"Cannot change file database
to user
name '%1'."
)
.
arg
(
newUserName
);
return
false
;
}
...
...
@@ -523,7 +524,7 @@ bool changeMessageDbName(const QString &oldUserName,
MessageDb
*
msgDb
=
GlobInstcs
::
messageDbsPtr
->
accessMessageDb
(
GlobInstcs
::
setPtr
->
dbsLocation
,
oldUserName
,
storeToDisk
);
if
(
Q_UNLIKELY
(
msgDb
==
Q_NULLPTR
))
{
errTxt
=
Accounts
::
tr
(
"Cannot access message database for user
name '%1'."
)
errTxt
=
Accounts
::
tr
(
"Cannot access message database for username '%1'."
)
.
arg
(
oldUserName
);
return
false
;
}
...
...
@@ -532,7 +533,7 @@ bool changeMessageDbName(const QString &oldUserName,
QString
currentDbFileName
=
msgDb
->
fileName
();
currentDbFileName
.
replace
(
oldUserName
,
newUserName
);
if
(
!
msgDb
->
moveDb
(
currentDbFileName
))
{
errTxt
=
Accounts
::
tr
(
"Cannot change message database
on the user
name '%1'."
)
errTxt
=
Accounts
::
tr
(
"Cannot change message database
to user
name '%1'."
)
.
arg
(
newUserName
);
return
false
;
}
...
...
@@ -595,8 +596,8 @@ bool Accounts::changeAccountUserName(const QVariant &acntModelVariant,
newUserName
.
toUtf8
().
constData
());
Dialogues
::
errorMessage
(
Dialogues
::
INFORMATION
,
tr
(
"Change user
name: %1"
).
arg
(
oldUserName
),
tr
(
"A new user
name '%1' for the account '%2' has been set."
)
tr
(
"Change username: %1"
).
arg
(
oldUserName
),
tr
(
"A new username '%1' for the account '%2' has been set."
)
.
arg
(
newUserName
).
arg
(
acntName
),
tr
(
"Account will use the new settings."
));
...
...
@@ -621,8 +622,8 @@ rollbackAccountChanges:
fail:
/* Show error dialogue with message what happened */
Dialogues
::
errorMessage
(
Dialogues
::
CRITICAL
,
tr
(
"User
name problem: %1"
).
arg
(
oldUserName
),
tr
(
"The new user
name '%1' for account '%2' has not been set!"
)
tr
(
"Username problem: %1"
).
arg
(
oldUserName
),
tr
(
"The new username '%1' for account '%2' has not been set!"
)
.
arg
(
newUserName
).
arg
(
acntName
),
errTxt
+
QStringLiteral
(
" "
)
+
tr
(
"Account will use the original settings."
));
...
...
src/net/isds_wrapper.cpp
View file @
f1cfc191
...
...
@@ -1163,7 +1163,7 @@ void IsdsWrapper::doLoginAction(const QString &isdsAction,
}
else
if
(
isdsAction
==
"changeUserName"
)
{
Dialogues
::
errorMessage
(
Dialogues
::
CRITICAL
,
tr
(
"Username change: %1"
).
arg
(
userName
),
tr
(
"Username could not be changed because an error occurred while trying to log in with
new user
name '%1'."
)
tr
(
"Username could not be changed because an error occurred while trying to log in with
the new user
name '%1'."
)
.
arg
(
userName
),
tr
(
"ISDS returns:"
)
+
" "
+
m_isdsSession
.
isdsCtxMap
[
userName
].
last_isds_msg
+
"
\n\n
"
+
tr
(
"Check your login data and try again."
));
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment