[Openlp-core] [Bug 1500368] Re: Easy way to Force Split verses
** Changed in: openlp Assignee: (unassigned) => Azaziah (suutari-olli) ** Changed in: openlp Status: New => In Progress -- You received this bug notification because you are a member of OpenLP Core, which is subscribed to OpenLP. https://bugs.launchpad.net/bugs/1500368 Title: Easy way to Force Split verses Status in OpenLP: In Progress Bug description: This request is closely related to this: https://bugs.launchpad.net/openlp/+bug/858344 Rather than add a comment to a bug tagged as Won't Fix, I chose to create a new request... This is something that we do at our church all the time, and the current implementation is a pain to use when doning multiple songs at a time (eg, our whole song library)... We have just recently moved from OpenSong, where a force split is made with a double pipe || When we imported our library into OpenLP, these all became OPTIONAL splits, not forced ones... Would it be possible to add a "Force Split" button, like the "Optional Split" one, but it's function recreates the tag of the song section that the cursor is currently in (I am guessing that you already are detecting this to advance the number ticker?) This would be the most intuitive way I can think of to implement this function. Another, less great, option would be to add the option to disable the auto-advance ot the number ticker. This would at least let us create multiple tags without having to change the ticker for each insert. To manage notifications about this bug go to: https://bugs.launchpad.net/openlp/+bug/1500368/+subscriptions ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Bug 858344] Re: Split Verse should have option to force the split
** Changed in: openlp Importance: Undecided => Wishlist ** Changed in: openlp Status: Won't Fix => In Progress ** Changed in: openlp Assignee: (unassigned) => Azaziah (suutari-olli) -- You received this bug notification because you are a member of OpenLP Core, which is subscribed to OpenLP. https://bugs.launchpad.net/bugs/858344 Title: Split Verse should have option to force the split Status in OpenLP: In Progress Bug description: Sometimes a verse needs to be split for readability issues and not just because it doesn't fit the screen. Please provide a facility for inserting an actual split in a verse and not just a hint on where to split if needed. Multiple 's are a workaround but it takes several rounds of trial and error to get the correct number of them. It would be better if there were some way to just say "always split here." To manage notifications about this bug go to: https://bugs.launchpad.net/openlp/+bug/858344/+subscriptions ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Bug 1576148] Re: Optional Split In Song Editor Does Nothing On Output Display Or Preview
** Changed in: openlp Status: New => In Progress ** Changed in: openlp Importance: Undecided => Wishlist -- You received this bug notification because you are a member of OpenLP Core, which is subscribed to OpenLP. https://bugs.launchpad.net/bugs/1576148 Title: Optional Split In Song Editor Does Nothing On Output Display Or Preview Status in OpenLP: In Progress Bug description: When using an 'optional split' under song editor and save then preview or go live it does nothing. I'm not sure if we're supposed to us a newline after an 'optional split' or not but I notice no change when using it. I'm on Linux Gentoo using OpenLP-2.4 Steps to reproduce are again: 1. Select a song in song view 2. Select edit song 3. Select a particular section of a song and select edit (or select edit all) 4. Select optional split in between two lines 5. Select OK 6. Select Save 7. Select Preview of the edited song or go live and nothing has changed To manage notifications about this bug go to: https://bugs.launchpad.net/openlp/+bug/1576148/+subscriptions ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~suutari-olli/openlp/bug-fixes-2-4-3 into lp:openlp
Review: Needs Fixing
Looks good, but just a little text fix...
Diff comments:
> === modified file 'openlp/core/__init__.py'
> --- openlp/core/__init__.py 2016-04-27 12:49:55 +
> +++ openlp/core/__init__.py 2016-10-17 04:44:46 +
> @@ -177,6 +177,40 @@
> self.shared_memory.create(1)
> return False
>
> +def is_data_path_missing(self):
> +"""
> +Check if the data folder path exists.
> +"""
> +data_folder_path = AppLocation.get_data_path()
> +if not os.path.exists(data_folder_path):
> +log.critical('Database was not found in:
> {path}'.format(path=data_folder_path))
> +status = QtWidgets.QMessageBox.critical(None,
> translate('OpenLP', 'Data Directory Error'),
> +translate('OpenLP',
> 'OpenLP data folder was not found in:\n\n{path}'
> +
> '\n\nThe location of the data folder was '
> +
> 'previously changed from the OpenLP\'s\n'
> +
> 'default location. If the data was stored on '
> +
> 'removable device, that device\nneeds to be '
> +
> 'made available.\n\n You may reset the data '
> +
> 'location back to the default settings, '
> +'or
> you can try to make the current location '
> +
> 'available.\n\n Do you want to reset the '
> +
> 'default data location?\n\n Click "No" to close'
> +
> 'OpenLP so you can try to fix the the problem.'
> +'\n
> Click "Yes" to reset the default data '
You should insert the actual text from the qt-yes-button to avoid the button
and text using differnt words.
> +
> 'location and start OpenLP.')
> +
> .format(path=data_folder_path),
> +
> QtWidgets.QMessageBox.StandardButtons(QtWidgets.QMessageBox.Yes |
> +
> QtWidgets.QMessageBox.No),
> +QtWidgets.QMessageBox.No)
> +if status == QtWidgets.QMessageBox.No:
> +# If answer was "No", return "True", it will shutdown OpenLP
> in def main
> +log.info('User requested termination')
> +return True
> +# If answer was "Yes", remove the custom data path thus
> resetting the default location.
> +Settings().remove('advanced/data path')
> +log.info('Database location has been reset to the default
> settings.')
> +return False
> +
> def hook_exception(self, exc_type, value, traceback):
> """
> Add an exception hook so that any uncaught exceptions are displayed
> in this window rather than somewhere where
--
https://code.launchpad.net/~suutari-olli/openlp/bug-fixes-2-4-3/+merge/308596
Your team OpenLP Core is subscribed to branch lp:openlp.
___
Mailing list: https://launchpad.net/~openlp-core
Post to : openlp-core@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openlp-core
More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~suutari-olli/openlp/fix-advanced-bible-search-clear-button-giving-focus-to-quick into lp:openlp
Review: Approve -- https://code.launchpad.net/~suutari-olli/openlp/fix-advanced-bible-search-clear-button-giving-focus-to-quick/+merge/306037 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~suutari-olli/openlp/fix-advanced-bible-search-clear-button-giving-focus-to-quick into lp:openlp
Review: Approve -- https://code.launchpad.net/~suutari-olli/openlp/fix-advanced-bible-search-clear-button-giving-focus-to-quick/+merge/306037 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Merge] lp:~suutari-olli/openlp/fix-advanced-bible-search-clear-button-giving-focus-to-quick into lp:openlp
The proposal to merge lp:~suutari-olli/openlp/fix-advanced-bible-search-clear-button-giving-focus-to-quick into lp:openlp has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~suutari-olli/openlp/fix-advanced-bible-search-clear-button-giving-focus-to-quick/+merge/306037 -- Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Merge] lp:~suutari-olli/openlp/fix-advanced-bible-search-clear-button-giving-focus-to-quick into lp:openlp
The proposal to merge lp:~suutari-olli/openlp/fix-advanced-bible-search-clear-button-giving-focus-to-quick into lp:openlp has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~suutari-olli/openlp/fix-advanced-bible-search-clear-button-giving-focus-to-quick/+merge/306037 -- Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~suutari-olli/openlp/change-blank-to-desktop-hotkey-to-esc into lp:openlp
Review: Approve -- https://code.launchpad.net/~suutari-olli/openlp/change-blank-to-desktop-hotkey-to-esc/+merge/307572 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Merge] lp:~suutari-olli/openlp/change-blank-to-desktop-hotkey-to-esc into lp:openlp
The proposal to merge lp:~suutari-olli/openlp/change-blank-to-desktop-hotkey-to-esc into lp:openlp has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~suutari-olli/openlp/change-blank-to-desktop-hotkey-to-esc/+merge/307572 -- Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~suutari-olli/openlp/change-blank-to-desktop-hotkey-to-esc into lp:openlp
Review: Approve -- https://code.launchpad.net/~suutari-olli/openlp/change-blank-to-desktop-hotkey-to-esc/+merge/307572 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~suutari-olli/openlp/change-blank-to-desktop-hotkey-to-esc into lp:openlp
Review: Needs Fixing Sorry conflicts with trunk. -- https://code.launchpad.net/~suutari-olli/openlp/change-blank-to-desktop-hotkey-to-esc/+merge/307572 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Merge] lp:~suutari-olli/openlp/change-blank-to-desktop-hotkey-to-esc into lp:openlp
The proposal to merge lp:~suutari-olli/openlp/change-blank-to-desktop-hotkey-to-esc into lp:openlp has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~suutari-olli/openlp/change-blank-to-desktop-hotkey-to-esc/+merge/307572 -- Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Bug 1616441] Re: Missing in String
** Changed in: openlp Status: In Progress => Fix Committed ** Changed in: openlp Milestone: None => 2.5.1 -- You received this bug notification because you are a member of OpenLP Core, which is subscribed to OpenLP. https://bugs.launchpad.net/bugs/1616441 Title: Missing in String Status in OpenLP: Fix Committed Bug description: In openlp/core/ui/exceptionform.py line 210 there is a missing which I believe may be due to a merge issue. To manage notifications about this bug go to: https://bugs.launchpad.net/openlp/+bug/1616441/+subscriptions ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Bug 1612187] Re: Changing shortcut to a key that is already used produces traceback
** Changed in: openlp Status: In Progress => Fix Committed ** Changed in: openlp Milestone: None => 2.5.1 -- You received this bug notification because you are a member of OpenLP Core, which is subscribed to OpenLP. https://bugs.launchpad.net/bugs/1612187 Title: Changing shortcut to a key that is already used produces traceback Status in OpenLP: Fix Committed Bug description: Changing shortcut to a key that is already used produces traceback. Traceback (most recent call last): File "E:\bzr\openlp\trunk\openlp\core\ui\shortcutlistform.py", line 97, in keyReleaseEvent if self._validiate_shortcut(self._current_item_action(), key_sequence): File "E:\bzr\openlp\trunk\openlp\core\ui\shortcutlistform.py", line 433, in _validiate_shortcut text, for_display=True) TypeError: warning_message() got an unexpected keyword argument 'for_display' Trunk rev 2690 | Win 10 To manage notifications about this bug go to: https://bugs.launchpad.net/openlp/+bug/1612187/+subscriptions ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Bug 1294111] Re: "Escape Item" needs focus on the live controller verse list
** Changed in: openlp/trunk Status: In Progress => Fix Committed ** Changed in: openlp/trunk Milestone: None => 2.5.1 -- You received this bug notification because you are a member of OpenLP Core, which is subscribed to OpenLP. https://bugs.launchpad.net/bugs/1294111 Title: "Escape Item" needs focus on the live controller verse list Status in OpenLP: Fix Committed Status in OpenLP 2.0 series: Won't Fix Status in OpenLP trunk series: Fix Committed Bug description: http://support.openlp.org/scp/tickets.php?id=2205 Pressing esc hides the main display. However this only happens when the focus is on the live controller's verse list. Looking in the "Configure Shortcuts" dialog I found esc is mapped to the "Escape Item" action. To manage notifications about this bug go to: https://bugs.launchpad.net/openlp/+bug/1294111/+subscriptions ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Bug 1497637] Re: Escape item does not work with .ppt or .odp
** Changed in: openlp Milestone: None => 2.5.1 ** Changed in: openlp Status: In Progress => Fix Committed -- You received this bug notification because you are a member of OpenLP Core, which is subscribed to OpenLP. https://bugs.launchpad.net/bugs/1497637 Title: Escape item does not work with .ppt or .odp Status in OpenLP: Fix Committed Bug description: Escape item does not work during .ppt or .odp presentations. Windows 8.1 / 2.1.6 Portable Edit: I found a way to fix this, but as result the .ppt can't be sent back to live by clicking it in "live", re-sending the file to live works. To manage notifications about this bug go to: https://bugs.launchpad.net/openlp/+bug/1497637/+subscriptions ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Bug 805082] Re: [windows] F1 shortcut does not work
** Changed in: openlp Status: In Progress => Fix Committed ** Changed in: openlp Milestone: 1.9.7 => 2.5.1 -- You received this bug notification because you are a member of OpenLP Core, which is subscribed to OpenLP. https://bugs.launchpad.net/bugs/805082 Title: [windows] F1 shortcut does not work Status in OpenLP: Fix Committed Bug description: Hey, The F1 shortcut is assigned twice in build 1672. They "Help" and "Online Help" entries are affected (in the help menu). This is due to a change (1667). Only old installations are affected (because the shortcut for the online help was saved and loaded, but the "help" entry shortcut was set to its default, which is F1 as well). Solution: - change the actions' object names (to reset the two shortcuts) - Revert the shortcut changes from r1667 To manage notifications about this bug go to: https://bugs.launchpad.net/openlp/+bug/805082/+subscriptions ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Merge] lp:~suutari-olli/openlp/change-blank-to-desktop-hotkey-to-esc into lp:openlp
Azaziah has proposed merging
lp:~suutari-olli/openlp/change-blank-to-desktop-hotkey-to-esc into lp:openlp.
Requested reviews:
Tim Bentley (trb143)
Tomas Groth (tomasgroth)
Related bugs:
Bug #805082 in OpenLP: "[windows] F1 shortcut does not work"
https://bugs.launchpad.net/openlp/+bug/805082
Bug #1294111 in OpenLP: ""Escape Item" needs focus on the live controller
verse list"
https://bugs.launchpad.net/openlp/+bug/1294111
Bug #1497637 in OpenLP: "Escape item does not work with .ppt or .odp"
https://bugs.launchpad.net/openlp/+bug/1497637
Bug #1612187 in OpenLP: "Changing shortcut to a key that is already used
produces traceback"
https://bugs.launchpad.net/openlp/+bug/1612187
Bug #1616441 in OpenLP: "Missing in String"
https://bugs.launchpad.net/openlp/+bug/1616441
For more details, see:
https://code.launchpad.net/~suutari-olli/openlp/change-blank-to-desktop-hotkey-to-esc/+merge/308660
- Replaced Escape item with "Show desktop"
(Same as blank to desktop, but does not unblank).
- Combined Offline & Online help buttons into "User Manual" button,
which launches the appropriate help based on OS. (Offline for Win/Mac)
- Improved blank to modes shortcut descriptions.
- Setting migration for old help/escape help keys.
- Fixed bugs:
https://bugs.launchpad.net/openlp/+bug/805082
https://bugs.launchpad.net/openlp/+bug/1612187
https://bugs.launchpad.net/openlp/+bug/1616441
https://bugs.launchpad.net/openlp/+bug/1497637
https://bugs.launchpad.net/openlp/+bug/1294111
lp:~suutari-olli/openlp/change-blank-to-desktop-hotkey-to-esc (revision 2716)
[[1;32mSUCCESS[1;m] https://ci.openlp.io/job/Branch-01-Pull/1799/
[[1;32mSUCCESS[1;m] https://ci.openlp.io/job/Branch-02-Functional-Tests/1710/
[[1;32mSUCCESS[1;m] https://ci.openlp.io/job/Branch-03-Interface-Tests/1648/
[[1;32mSUCCESS[1;m]
https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1404/
[[1;32mSUCCESS[1;m]
https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/994/
[[1;32mSUCCESS[1;m] https://ci.openlp.io/job/Branch-05a-Code_Analysis/1062/
[[1;32mSUCCESS[1;m] https://ci.openlp.io/job/Branch-05b-Test_Coverage/930/
[[1;32mSUCCESS[1;m] https://ci.openlp.io/job/Branch-05c-Code_Analysis2/91/
--
Your team OpenLP Core is subscribed to branch lp:openlp.
=== modified file 'openlp/core/common/settings.py'
--- openlp/core/common/settings.py 2016-07-31 11:58:54 +
+++ openlp/core/common/settings.py 2016-10-17 18:10:16 +
@@ -214,7 +214,10 @@
('media/players', 'media/players_temp', [(media_players_conv, None)]), # Convert phonon to system
('media/players_temp', 'media/players', []), # Move temp setting from above to correct setting
('advanced/default color', 'core/logo background color', []), # Default image renamed + moved to general > 2.4.
-('advanced/default image', '/core/logo file', []) # Default image renamed + moved to general after 2.4.
+('advanced/default image', 'core/logo file', []), # Default image renamed + moved to general after 2.4.
+('shortcuts/escapeItem', 'shortcuts/desktopScreenEnable', []), # Escape item was removed in 2.6.
+('shortcuts/offlineHelpItem', 'shortcuts/HelpItem', []), # Online and Offline help were combined in 2.6.
+('shortcuts/onlineHelpItem', 'shortcuts/HelpItem', []) # Online and Offline help were combined in 2.6.
]
@staticmethod
@@ -261,10 +264,10 @@
'shortcuts/blankScreen': [QtGui.QKeySequence(QtCore.Qt.Key_Period)],
'shortcuts/collapse': [QtGui.QKeySequence(QtCore.Qt.Key_Minus)],
'shortcuts/desktopScreen': [QtGui.QKeySequence(QtCore.Qt.Key_D)],
+'shortcuts/desktopScreenEnable': [QtGui.QKeySequence(QtCore.Qt.Key_Escape)],
'shortcuts/delete': [QtGui.QKeySequence(QtGui.QKeySequence.Delete)],
'shortcuts/down': [QtGui.QKeySequence(QtCore.Qt.Key_Down)],
'shortcuts/editSong': [],
-'shortcuts/escapeItem': [QtGui.QKeySequence(QtCore.Qt.Key_Escape)],
'shortcuts/expand': [QtGui.QKeySequence(QtCore.Qt.Key_Plus)],
'shortcuts/exportThemeItem': [],
'shortcuts/fileNewItem': [QtGui.QKeySequence(QtGui.QKeySequence.New)],
@@ -273,6 +276,7 @@
'shortcuts/fileSaveItem': [QtGui.QKeySequence(QtGui.QKeySequence.Save)],
'shortcuts/fileOpenItem': [QtGui.QKeySequence(QtGui.QKeySequence.Open)],
'shortcuts/goLive': [],
+'shortcuts/HelpItem': [QtGui.QKeySequence(QtGui.QKeySequence.HelpContents)],
'shortcuts/importThemeItem': [],
'shortcuts/importBibleItem': [],
'shortcuts/listViewBiblesDeleteItem': [QtGui.QKeySequence(QtGui.QKeySequence.Delete)],
@@ -333,8 +337,6 @@
QtGui.QKeySequence(QtCore.Qt.Key_PageDown)],
'shortcuts/nextService': [QtGui.QKeySequence(QtCore.Qt.Key_Right)],
'shortcut
[Openlp-core] [Merge] lp:~suutari-olli/openlp/change-blank-to-desktop-hotkey-to-esc into lp:openlp
The proposal to merge lp:~suutari-olli/openlp/change-blank-to-desktop-hotkey-to-esc into lp:openlp has been updated. Status: Needs review => Superseded For more details, see: https://code.launchpad.net/~suutari-olli/openlp/change-blank-to-desktop-hotkey-to-esc/+merge/307572 -- Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~suutari-olli/openlp/change-blank-to-desktop-hotkey-to-esc into lp:openlp
Review: Approve -- https://code.launchpad.net/~suutari-olli/openlp/change-blank-to-desktop-hotkey-to-esc/+merge/308660 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~suutari-olli/openlp/bug-fixes-2-4-3 into lp:openlp
Review: Needs Fixing
See below
Diff comments:
>
> === modified file 'openlp/core/lib/__init__.py'
> --- openlp/core/lib/__init__.py 2016-08-12 19:16:12 +
> +++ openlp/core/lib/__init__.py 2016-10-17 04:44:46 +
> @@ -310,30 +310,23 @@
>
> def create_separated_list(string_list):
> """
> -Returns a string that represents a join of a list of strings with a
> localized separator. This function corresponds
> -
> -to QLocale::createSeparatedList which was introduced in Qt 4.8 and
> implements the algorithm from
> -http://www.unicode.org/reports/tr35/#ListPatterns
> -
> - :param string_list: List of unicode strings
> +Returns a string that represents a join of a list of strings with a
> localized separator.
> +Localized separation will be done via the translate() function by the
> translators.
> +
> +:param string_list: List of unicode strings
> +:return: Formatted string
> """
> -if LooseVersion(Qt.PYQT_VERSION_STR) >= LooseVersion('4.9') and
> LooseVersion(Qt.qVersion()) >= LooseVersion('4.8'):
> -return QtCore.QLocale().createSeparatedList(string_list)
> -if not string_list:
> -return ''
> -elif len(string_list) == 1:
> -return string_list[0]
> -# TODO: Verify mocking of translate() test before conversion
> -elif len(string_list) == 2:
> -return translate('OpenLP.core.lib', '%s and %s',
> - 'Locale list separator: 2 items') %
> (string_list[0], string_list[1])
> +list_length = len(string_list)
> +if list_length == 1:
> +return_list = string_list[0]
return_list implies the field is a list when it is a string.
> +elif list_length == 2:
> +return_list = translate('OpenLP.core.lib', '{one} and
> {two}').format(one=string_list[0], two=string_list[1])
should we not just translate "and" once and then build the strings as there is
a high chance of the {} getting lost.
> +elif list_length > 2:
> +return_list = translate('OpenLP.core.lib', '{first}, and
> {last}').format(first=', '.join(string_list[:-1]),
> +
> last=string_list[-1])
> else:
> -merged = translate('OpenLP.core.lib', '%s, and %s',
> - 'Locale list separator: end') % (string_list[-2],
> string_list[-1])
> -for index in reversed(list(range(1, len(string_list) - 2))):
> -merged = translate('OpenLP.core.lib', '%s, %s',
> - 'Locale list separator: middle') %
> (string_list[index], merged)
> -return translate('OpenLP.core.lib', '%s, %s', 'Locale list
> separator: start') % (string_list[0], merged)
> +return_list = ""
Should be ''
> +return return_list
>
>
> from .exceptions import ValidationError
--
https://code.launchpad.net/~suutari-olli/openlp/bug-fixes-2-4-3/+merge/308596
Your team OpenLP Core is subscribed to branch lp:openlp.
___
Mailing list: https://launchpad.net/~openlp-core
Post to : openlp-core@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openlp-core
More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~suutari-olli/openlp/bug-fixes-2-4-3 into lp:openlp
Answered to trb143's notes.
Diff comments:
>
> === modified file 'openlp/core/lib/__init__.py'
> --- openlp/core/lib/__init__.py 2016-08-12 19:16:12 +
> +++ openlp/core/lib/__init__.py 2016-10-17 04:44:46 +
> @@ -310,30 +310,23 @@
>
> def create_separated_list(string_list):
> """
> -Returns a string that represents a join of a list of strings with a
> localized separator. This function corresponds
> -
> -to QLocale::createSeparatedList which was introduced in Qt 4.8 and
> implements the algorithm from
> -http://www.unicode.org/reports/tr35/#ListPatterns
> -
> - :param string_list: List of unicode strings
> +Returns a string that represents a join of a list of strings with a
> localized separator.
> +Localized separation will be done via the translate() function by the
> translators.
> +
> +:param string_list: List of unicode strings
> +:return: Formatted string
> """
> -if LooseVersion(Qt.PYQT_VERSION_STR) >= LooseVersion('4.9') and
> LooseVersion(Qt.qVersion()) >= LooseVersion('4.8'):
> -return QtCore.QLocale().createSeparatedList(string_list)
> -if not string_list:
> -return ''
> -elif len(string_list) == 1:
> -return string_list[0]
> -# TODO: Verify mocking of translate() test before conversion
> -elif len(string_list) == 2:
> -return translate('OpenLP.core.lib', '%s and %s',
> - 'Locale list separator: 2 items') %
> (string_list[0], string_list[1])
> +list_length = len(string_list)
> +if list_length == 1:
> +return_list = string_list[0]
I've changed this to:
list_to_string
> +elif list_length == 2:
> +return_list = translate('OpenLP.core.lib', '{one} and
> {two}').format(one=string_list[0], two=string_list[1])
The problem with the word "and" is that in English "," is used before it, where
as in many other languages "," is never used before "and". To make it even more
complicated there's no "," before and if the list only has two items.
> +elif list_length > 2:
> +return_list = translate('OpenLP.core.lib', '{first}, and
> {last}').format(first=', '.join(string_list[:-1]),
> +
> last=string_list[-1])
> else:
> -merged = translate('OpenLP.core.lib', '%s, and %s',
> - 'Locale list separator: end') % (string_list[-2],
> string_list[-1])
> -for index in reversed(list(range(1, len(string_list) - 2))):
> -merged = translate('OpenLP.core.lib', '%s, %s',
> - 'Locale list separator: middle') %
> (string_list[index], merged)
> -return translate('OpenLP.core.lib', '%s, %s', 'Locale list
> separator: start') % (string_list[0], merged)
> +return_list = ""
Good catch, I've fixed it.
> +return return_list
>
>
> from .exceptions import ValidationError
--
https://code.launchpad.net/~suutari-olli/openlp/bug-fixes-2-4-3/+merge/308596
Your team OpenLP Core is subscribed to branch lp:openlp.
___
Mailing list: https://launchpad.net/~openlp-core
Post to : openlp-core@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openlp-core
More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~suutari-olli/openlp/change-blank-to-desktop-hotkey-to-esc into lp:openlp
Review: Approve -- https://code.launchpad.net/~suutari-olli/openlp/change-blank-to-desktop-hotkey-to-esc/+merge/308660 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~suutari-olli/openlp/bug-fixes-2-4-3 into lp:openlp
>The problem with the word "and" is that in English "," is used before >it, where as in many other languages "," is never used before "and". To >make it even more complicated there's no "," before and if the list >only has two items. Actually, it depends on the person. I personally hold to "no comma before 'and'", but my wife insists on adding the comma. Both are correct. -- Raoul Snyman 082 550 3754 ra...@snyman.info Sent from my Android device with K-9 Mail. Please excuse my brevity. https://code.launchpad.net/~suutari-olli/openlp/bug-fixes-2-4-3/+merge/308596 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
