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.

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

[ticket/12325] Automatic update should notify about outdated files #2493

Merged
merged 6 commits into from
Jun 27, 2014

Conversation

Nicofuma
Copy link
Member

@@ -501,6 +503,7 @@
'SELECT_DOWNLOAD_FORMAT' => 'Select download archive format',
'SELECT_FTP_SETTINGS' => 'Select FTP settings',
'SHOW_DIFF_CONFLICT' => 'Show differences/conflicts',
'SHOW_DIFF_DELETED' => 'Show file contents',
Copy link
Contributor

Choose a reason for hiding this comment

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

"Show file" ?

Copy link
Member Author

Choose a reason for hiding this comment

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

it's to be consistent with new files

@nickvergessen
Copy link
Contributor

It's stuck in an infinte loop for me

@Nicofuma
Copy link
Member Author

fixed

<dl>
<dt style="width: 60%;"><strong><!-- IF deleted.DIR_PART -->{deleted.DIR_PART}<br /><!-- ENDIF -->{deleted.FILE_PART}</strong>
</dt>
<dd style="margin-{S_CONTENT_FLOW_BEGIN} 60%;">
Copy link
Contributor

Choose a reason for hiding this comment

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

now the : is missing :P

Copy link
Member Author

Choose a reason for hiding this comment

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

right... updated

Copy link
Member Author

Choose a reason for hiding this comment

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

well, we have to use L_COLON

Copy link
Contributor

Choose a reason for hiding this comment

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

No, use :

L_COLON is translatable, some language may use -- instead and then the css is broken?

Copy link
Member Author

Choose a reason for hiding this comment

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

updated

@nickvergessen
Copy link
Contributor

Hmm I just tried to update from 3.0.12 to 3.1.0-b4
Takes rather long to crawl throught all the folders and delete the files manually.
Should we add button to move them into a store/backup folder or something like that.
Or shall we do that in a new PR to keep things small and separated.

<legend><img src="{T_IMAGE_PATH}icon_delete.gif" alt="{L_STATUS_DELETED}" /></legend>
<!-- BEGIN deleted -->
<dl>
<dt style="width: 60%;"><strong><!-- IF deleted.DIR_PART -->{deleted.DIR_PART}<br /><!-- ENDIF -->{deleted.FILE_PART}</strong>
Copy link
Contributor

Choose a reason for hiding this comment

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

Not really important, but everything from <strong> shoud be on a new line, no?
Or </dt> on the previous line.

Copy link
Member Author

Choose a reason for hiding this comment

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

updated

nickvergessen added a commit to nickvergessen/phpbb that referenced this pull request May 30, 2014
[ticket/12325] Automatic update should notify about outdated files

* Nicofuma/ticket/12325:
  [ticket/12325] Update coding style in template
  [ticket/12325] Fix: add a missing colon
  [ticket/12325] Don't use L_COLON
  [ticket/12325] Fix: it's not stuck in an inifinite loop anymore
  [ticket/12325] Automatic update should notify about outdated files
@@ -514,6 +517,7 @@
'STAGE_UPDATE_FILES' => 'Update files',
'STAGE_VERSION_CHECK' => 'Version check',
'STATUS_CONFLICT' => 'Modified file producing conflicts',
'L_STATUS_DELETED' => 'Deleted file',
Copy link
Contributor

Choose a reason for hiding this comment

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

L_ ?

Copy link
Member Author

Choose a reason for hiding this comment

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

updated

@bantu
Copy link
Collaborator

bantu commented Jun 5, 2014

Should we add button to move them into a store/backup folder or something like that.

phpBB and the FTP user are usually different, so this likely won't be possibly in most cases.

Or shall we do that in a new PR to keep things small and separated.

The latter please.

@nickvergessen
Copy link
Contributor

With this patch the file list is quite long, when updating from 3.0 to 3.1
I think we should fold the list of new files and non-conflicting files per default,
so the focus is more on the deleting which requires user interaction to continue.
But I will create a separate ticket for that.

nickvergessen added a commit to nickvergessen/phpbb that referenced this pull request Jun 27, 2014
[ticket/12325] Automatic update should notify about outdated files

* Nicofuma/ticket/12325:
  [ticket/12325] Fix the language var name
  [ticket/12325] Update coding style in template
  [ticket/12325] Fix: add a missing colon
  [ticket/12325] Don't use L_COLON
  [ticket/12325] Fix: it's not stuck in an inifinite loop anymore
  [ticket/12325] Automatic update should notify about outdated files
@nickvergessen nickvergessen merged commit 7c16d1c into phpbb:develop-ascraeus Jun 27, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants