Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Nextcloud
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Monitor
Service Desk
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
TeDomum
Nextcloud
Commits
d23c7fff
Unverified
Commit
d23c7fff
authored
4 years ago
by
Roeland Jago Douma
Committed by
GitHub
4 years ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #20957 from nextcloud/Valdnet-patch-5
l10n: Adding "The" before "Following"
parents
f80f2a22
8e3de41b
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
lib/private/App/DependencyAnalyzer.php
+2
-2
2 additions, 2 deletions
lib/private/App/DependencyAnalyzer.php
tests/lib/App/DependencyAnalyzerTest.php
+4
-4
4 additions, 4 deletions
tests/lib/App/DependencyAnalyzerTest.php
with
6 additions
and
6 deletions
lib/private/App/DependencyAnalyzer.php
+
2
−
2
View file @
d23c7fff
...
@@ -195,7 +195,7 @@ class DependencyAnalyzer {
...
@@ -195,7 +195,7 @@ class DependencyAnalyzer {
},
$supportedDatabases
);
},
$supportedDatabases
);
$currentDatabase
=
$this
->
platform
->
getDatabase
();
$currentDatabase
=
$this
->
platform
->
getDatabase
();
if
(
!
in_array
(
$currentDatabase
,
$supportedDatabases
))
{
if
(
!
in_array
(
$currentDatabase
,
$supportedDatabases
))
{
$missing
[]
=
(
string
)
$this
->
l
->
t
(
'
F
ollowing databases are supported: %s'
,
[
implode
(
', '
,
$supportedDatabases
)]);
$missing
[]
=
(
string
)
$this
->
l
->
t
(
'
The f
ollowing databases are supported: %s'
,
[
implode
(
', '
,
$supportedDatabases
)]);
}
}
return
$missing
;
return
$missing
;
}
}
...
@@ -298,7 +298,7 @@ class DependencyAnalyzer {
...
@@ -298,7 +298,7 @@ class DependencyAnalyzer {
}
}
$currentOS
=
$this
->
platform
->
getOS
();
$currentOS
=
$this
->
platform
->
getOS
();
if
(
!
in_array
(
$currentOS
,
$oss
))
{
if
(
!
in_array
(
$currentOS
,
$oss
))
{
$missing
[]
=
(
string
)
$this
->
l
->
t
(
'
F
ollowing platforms are supported: %s'
,
[
implode
(
', '
,
$oss
)]);
$missing
[]
=
(
string
)
$this
->
l
->
t
(
'
The f
ollowing platforms are supported: %s'
,
[
implode
(
', '
,
$oss
)]);
}
}
return
$missing
;
return
$missing
;
}
}
...
...
This diff is collapsed.
Click to expand it.
tests/lib/App/DependencyAnalyzerTest.php
+
4
−
4
View file @
d23c7fff
...
@@ -432,8 +432,8 @@ class DependencyAnalyzerTest extends TestCase {
...
@@ -432,8 +432,8 @@ class DependencyAnalyzerTest extends TestCase {
return
[
return
[
[[],
null
],
[[],
null
],
[[],
[]],
[[],
[]],
[[
'
F
ollowing platforms are supported: ANDROID'
],
'ANDROID'
],
[[
'
The f
ollowing platforms are supported: ANDROID'
],
'ANDROID'
],
[[
'
F
ollowing platforms are supported: WINNT'
],
[
'WINNT'
]]
[[
'
The f
ollowing platforms are supported: WINNT'
],
[
'WINNT'
]]
];
];
}
}
...
@@ -493,8 +493,8 @@ class DependencyAnalyzerTest extends TestCase {
...
@@ -493,8 +493,8 @@ class DependencyAnalyzerTest extends TestCase {
// non BC - in case on databases are defined -> all are supported
// non BC - in case on databases are defined -> all are supported
[[],
null
],
[[],
null
],
[[],
[]],
[[],
[]],
[[
'
F
ollowing databases are supported: mongodb'
],
'mongodb'
],
[[
'
The f
ollowing databases are supported: mongodb'
],
'mongodb'
],
[[
'
F
ollowing databases are supported: sqlite, postgres'
],
[
'sqlite'
,
[
'@value'
=>
'postgres'
]]],
[[
'
The f
ollowing databases are supported: sqlite, postgres'
],
[
'sqlite'
,
[
'@value'
=>
'postgres'
]]],
];
];
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment