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

file_status: patch to fix plural wording #1389

Merged
merged 5 commits into from
Aug 9, 2018

Conversation

cyrinux
Copy link
Contributor

@cyrinux cyrinux commented Jul 7, 2018

@cyrinux cyrinux changed the title patch to fix plural wording file_status: patch to fix plural wording Jul 7, 2018
@lasers
Copy link
Contributor

lasers commented Jul 7, 2018

@cyrinux Fix Travis. EDIT: Lmao. New version went out.... It's going to be messy depreciating this properly. Idk. Give up, maybe.... or we can still deprecate it. ;-)

@cyrinux
Copy link
Contributor Author

cyrinux commented Jul 8, 2018

Hey @lasers sorry, was too slow, i try to fix this.

@cyrinux
Copy link
Contributor Author

cyrinux commented Jul 8, 2018

@lasers, is it good for you as this?

@lasers
Copy link
Contributor

lasers commented Jul 9, 2018

@cyrinux Yes. Very nice. Add this too and we should be done.

diff --git a/py3status/modules/file_status.py b/py3status/modules/file_status.py
index 5d15b09b..a5699513 100644
--- a/py3status/modules/file_status.py
+++ b/py3status/modules/file_status.py
@@ -149,6 +149,7 @@ class Py3status:
 
         if self.thresholds:
             self.py3.threshold_get_color(count_path, 'path')
+            self.py3.threshold_get_color(count_path, 'paths')
 
         return {
             'cached_until': self.py3.time_in(self.cache_timeout),

@cyrinux
Copy link
Contributor Author

cyrinux commented Jul 9, 2018

Hi :) Is it well for recover color from old format?

Copy link
Contributor

@lasers lasers left a comment

Choose a reason for hiding this comment

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

Yes, coloring for old 3.11 format. We 3.12. ;-) Ty.

self.py3.threshold_get_color(count_path, 'paths')

return {
'cached_until':
self.py3.time_in(self.cache_timeout),
'full_text': self.py3.safe_format(
self.format, {
'paths': count_path,
'path': count_path,
Copy link
Contributor

@lasers lasers Jul 9, 2018

Choose a reason for hiding this comment

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

@cyrinux Can you add paths: count_path # deprecation here? This trips because it's a list. Deprecation replace_placeholder works on {paths} but not \?if=paths. Ty. Sorry. Xoxo.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done. Xoxo ^^

@cyrinux cyrinux force-pushed the file_status_plural_fix branch from 6963a51 to 0cf4bf8 Compare July 9, 2018 08:24
@cyrinux cyrinux force-pushed the file_status_plural_fix branch from 0cf4bf8 to c8098c3 Compare July 9, 2018 08:28
@ultrabug
Copy link
Owner

Are you trying to remove plural wording or to add one? I see a mix of both in the resulting file, I'm confused

@ultrabug ultrabug self-assigned this Jul 30, 2018
@lasers
Copy link
Contributor

lasers commented Jul 30, 2018

Both. missing path should also be renamed to missing paths too.

@ultrabug ultrabug added the black star ⭐ Please review this first label Jul 30, 2018
@cyrinux cyrinux force-pushed the file_status_plural_fix branch 2 times, most recently from c0fd701 to 57a1aa7 Compare August 2, 2018 13:42
@cyrinux cyrinux force-pushed the file_status_plural_fix branch from 0c5742e to 0482a40 Compare August 2, 2018 15:28
@lasers
Copy link
Contributor

lasers commented Aug 8, 2018

@ultrabug Ping.

@ultrabug
Copy link
Owner

ultrabug commented Aug 9, 2018

K @lasers following our discussion, I merge

@ultrabug ultrabug merged commit 3467a64 into ultrabug:master Aug 9, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
black star ⭐ Please review this first
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants