Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

php7-compat #442

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

php7-compat #442

wants to merge 3 commits into from

Conversation

thehe
Copy link

@thehe thehe commented Dec 30, 2015

just basic php7 compatibility

jrencz
jrencz reviewed Feb 8, 2016
View reviewed changes
dmCorePlugin/config/dm/assets.yml
@@ -49,7 +49,7 @@ js:
ui-effects-transfer: jquery-ui/js/minified/jquery.effects.transfer.min
metadata: metadata/jquery.metadata.min
form: form/jquery.form
blockUI: blockUI/jquery.blockUI-2.39
blockUI: blockUI/jquery.blockUI-2.70.0
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this one des not seem to be relevant to the issue you're fixing in this PR. Please consider submitting this one as a distinct one.

@jrencz
Copy link
Contributor

jrencz commented Feb 8, 2016

could you please remove cursing from commit logs?

@thehe
Copy link
Author

thehe commented Feb 9, 2016

hey guys,

  1. sorry - thought i pushed into my private repo!
  2. no - no REAL hardcoding, it's just because you're only importing i18n-seed-data (basic translations) if there are MORE than one language and language is default!
    if you just set 'de' for example, you won't get any translation for the backend.

A collegue and me thought that this would be the "smallest possibile fix" for this issue and we don't want to spend too much time in diem - projects seems more than dead.
(for example the "plugins"-pages on diem-project.org are unavailable since months).

regards

4levels
4levels reviewed Jun 22, 2016
View reviewed changes
dmCorePlugin/lib/i18n/dmMessageFormat.php
@@ -68,7 +68,7 @@ public function formatFastUntranslated($string, array $args)
return $this->postscript[0].$this->replaceArgs($string, $args).$this->postscript[1];
}

public function addTranslations($culture, array $translations, $catalogue, $culture)
public function addTranslations($culture, array $translations, $catalogue, $_culture)
Copy link
Member

@4levels 4levels Jun 22, 2016 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The renamed variable $_culture is not used

@4levels
Copy link
Member

4levels commented Jun 22, 2016

I've added some of your changes in the master branch (eg. de deprecation warnings since php > 5.6). I've also updated the symfony submodule (merged changes from forked origin and some PR's regarding deprecation warning). I'd love to merge your PR but there are still some issues..

@thehe
Copy link
Author

thehe commented Jun 22, 2016

Hey - for sure there are some conflicts, i don't wanted to produce conflicts...
This variable can be deleted, yes, but I didn't get, what it did BEFORE my changes, so i thought, that someone who knows, should decide, how to handle this...

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@thehe @jrencz @4levels