Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
MetaGer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor 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
open-source
MetaGer
Commits
d49cf98b
Commit
d49cf98b
authored
7 years ago
by
Aria Givi
Browse files
Options
Downloads
Patches
Plain Diff
Grundstein zum Überprüfen der Änderungen gesetzt
parent
1219211b
No related branches found
Branches containing commit
No related tags found
2 merge requests
!912
Development
,
!904
Resolve "Arbeit am Übersetzungstool"
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
app/Http/Controllers/MailController.php
+5
-9
5 additions, 9 deletions
app/Http/Controllers/MailController.php
resources/views/languages/synoptic.blade.php
+2
-2
2 additions, 2 deletions
resources/views/languages/synoptic.blade.php
with
7 additions
and
11 deletions
app/Http/Controllers/MailController.php
+
5
−
9
View file @
d49cf98b
...
...
@@ -121,7 +121,6 @@ class MailController extends Controller
public
function
isEdited
(
$k
,
$v
,
$filename
)
{
$temp
=
include
resource_path
()
.
"/"
.
$filename
;
foreach
(
$temp
as
$key
=>
$value
)
{
if
(
$k
===
$key
&&
$v
!==
$value
)
{
return
true
;
...
...
@@ -219,6 +218,7 @@ class MailController extends Controller
public
function
downloadModifiedLanguagefiles
(
Request
$request
,
$exclude
=
""
)
{
$filename
=
$request
->
input
(
'filename'
);
# Wir erstellen nun zunächst den Inhalt der Datei:
$data
=
[];
...
...
@@ -230,17 +230,15 @@ class MailController extends Controller
if
(
$key
===
"filename"
||
$value
===
""
)
{
continue
;
}
if
(
$key
===
"email"
)
{
$emailAddress
=
$value
;
continue
;
}
$key
=
base64_decode
(
$key
);
#Pfad zur Datei anhand des Schlüsselnamens rekonstruieren (Schlüssel enthält Sprachkürzel)
$filename
=
"languages/"
.
substr
(
$key
,
strpos
(
$key
,
"/_\w\w_/"
),
strripos
(
$key
,
"_"
))
.
"/"
.
$filename
;
if
(
strpos
(
$key
,
"_new_"
)
===
0
&&
$value
!==
""
)
{
$new
++
;
$key
=
substr
(
$key
,
strpos
(
$key
,
"_new_"
)
+
5
);
$key
=
preg_filter
(
"/_\w*_/"
,
""
,
$key
);
$editedKeys
=
$editedKeys
.
"
\n
"
.
$key
;
}
}
else
if
(
$this
->
isEdited
(
$key
,
$value
,
$filename
))
{
$new
++
;
$editedKeys
=
$editedKeys
.
"
\n
"
.
$key
;
...
...
@@ -293,8 +291,6 @@ class MailController extends Controller
}
// var_dump($ex);
//die();
$ex
=
base64_encode
(
serialize
(
$ex
));
return
redirect
(
url
(
'synoptic'
,
[
'exclude'
=>
$ex
]));
...
...
This diff is collapsed.
Click to expand it.
resources/views/languages/synoptic.blade.php
+
2
−
2
View file @
d49cf98b
...
...
@@ -31,9 +31,9 @@
<tr>
<!--Key -->
<td
class=
"name language-name"
>
{{preg_replace("/(\s*).*#(.*)$/si", "$1$2", $key)}}
</td>
@foreach($language as $lang => $languageValue)
@if($lang
=
== "
de
")
@if($lang
uageValue !
== "")
<td>
<textarea
class=
"language-text-area"
rows=
"1"
readonly
cols=
"20"
form=
"submit"
name=
"{{base64_encode(
"
_new_
".
$
lang.
"
_
".$
key
)}}"
>
{{ $languageValue }}
</textarea>
<textarea
class=
"language-text-area"
rows=
"1"
readonly
cols=
"20"
form=
"submit"
name=
"{{base64_encode($lang."
_
".$
key
)}}"
>
{{ $languageValue }}
</textarea>
</td>
@else
<td>
...
...
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