Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
I
ISPConfig 3
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Helmo
ISPConfig 3
Commits
c2d9267b
Commit
c2d9267b
authored
16 years ago
by
fantu
Browse files
Options
Downloads
Patches
Plain Diff
- Improved merge in language: add remove of line how not exists in master language
parent
fa5f9135
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
TODO.txt
+0
-5
0 additions, 5 deletions
TODO.txt
interface/web/admin/language_complete.php
+10
-0
10 additions, 0 deletions
interface/web/admin/language_complete.php
with
10 additions
and
5 deletions
TODO.txt
+
0
−
5
View file @
c2d9267b
...
...
@@ -88,8 +88,3 @@ General tasks
- Add, extend or modify comments in PEAR syntax so that they can be read with phpdocumentor.
Language editor
--------------------------------------
- Merge: remove the line how exists in language to merge but not in main (removed in main because not use or change for fix)
This diff is collapsed.
Click to expand it.
interface/web/admin/language_complete.php
+
10
−
0
View file @
c2d9267b
...
...
@@ -112,6 +112,14 @@ function merge_langfile($langfile,$masterfile) {
$n
++
;
}
}
$r
=
0
;
foreach
(
$wb
as
$key
=>
$val
)
{
if
(
!
isset
(
$wb_master
[
$key
]))
{
unset
(
$wb
[
$key
]);
$r
++
;
}
}
$file_content
=
"<?php
\n
"
;
foreach
(
$wb
as
$key
=>
$val
)
{
...
...
@@ -122,6 +130,8 @@ function merge_langfile($langfile,$masterfile) {
$file_content
.
=
"?>
\n
"
;
$msg
.
=
"Added
$n
lines to the file
$langfile
<br />"
;
if
(
$r
!=
0
)
$msg
.
=
"Removed
$r
lines to the file
$langfile
<br />"
;
file_put_contents
(
$langfile
,
$file_content
);
}
else
{
$msg
.
=
"File does not exist yet. Copied file
$masterfile
to
$langfile
<br />"
;
...
...
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