Re: PR #1277

2018-09-15 Thread Dirk Hohndel 
> On September 15, 2018 4:11:05 AM PDT, Willem Ferguson 
> mailto:willemfergu...@zoology.up.ac.za>> 
> wrote:
> Dear Lubomir, Dirk,
> 
> Please look at #1277. Github told me at the time that this PR was pulled 
> and it is indeed reflected in the latest master user-manual.txt in 
> src/subsurface/Documentation. BUT it is clearly NOT in the present 
> user-manual.html in subsurface/build/Documentation. There must be some 
> issue with the build script or am I going mad?

My current guess is that you are missing a few tools and that our build system 
silently gives you the HTML files that are stored in git.
On Ubuntu you need to run

sudo apt install asciidoc w3m

in order to be able to create the HTML files from source.

Additionally, most of the .txt files had errors in them which caused the 
conversion to HTML to fail, as a result of which the HTML versions stored in 
git were outdated.
I fixed all of those (but for the French version for example they need to be 
reflected in the tooling used to create the translation) and pushed new 
.html.git files.

With this you should see the updates that you were missing.

/D

___
subsurface mailing list
subsurface@subsurface-divelog.org
http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface

Changes to user manual

2018-09-15 Thread Willem Ferguson 
I submitted a PR with a small C++ code change (dive list context menu) 
that you already know about as well as the changes to the user manual to 
reflect Berthold's work with videos. It took much more work than I had 
anticipated.


There are about nine other images in the user manual that still show the 
old Photos tab, and not he current Media tab. But most of them are not 
simple cases of screenshots, but are images that require some graphic 
manipulation. I will not get to that by the time Dirk wishes to publish 
the new release. But ALL screenshots pertaining remotely to media are up 
to date and, as far as I know, correct. I will work on the other images 
within the next week. I did a spelling check of the text and it should 
be ok.


Berthold, are you able at all to look at my PR and see if this looks 
satisfactory to you at all? Feel absolutely free to modify. I put the 
technical details of the video thumbnails in an appendix that is 
hyperlinked to the main text dealing with media.


I have a mail from Dirk saying that he will deal with the issue of 
appdata.xml that is inadvertently changed by the build script.


Kind regards,

willem



--
This message and attachments are subject to a disclaimer.

Please refer to 
http://upnet.up.ac.za/services/it/documentation/docs/004167.pdf 
 for
full 
details.

___
subsurface mailing list
subsurface@subsurface-divelog.org
http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface

Re: planning for 4.8.2 / 2.1.2

2018-09-15 Thread Pedro Neves 

On 9/14/18 7:20 PM, Dirk Hohndel wrote:

Thanks for the reminder… I’ll push out one more time.

/D


Dirk:

2 more strings missing for translation. When right clicking on a dive:

1 - Load media from file(s)

2 - Load media from web


The first string shows up on Transifex, but I get a warning: "The 
translation does not contain the same number of opening parentheses '(' 
as the original phrase". This is normal, as the PT translation needs 
this additional parentheses. The second string doesn't show up at all...



Cheers:

Pedro

___
subsurface mailing list
subsurface@subsurface-divelog.org
http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface

Re: PR #1277

2018-09-15 Thread Dirk Hohndel 
I believe I know what's wrong. I won't be at my computer for a few hours, but 
will address this later today

/D

On September 15, 2018 4:11:05 AM PDT, Willem Ferguson 
 wrote:
>Dear Lubomir, Dirk,
>
>Please look at #1277. Github told me at the time that this PR was
>pulled 
>and it is indeed reflected in the latest master user-manual.txt in 
>src/subsurface/Documentation. BUT it is clearly NOT in the present 
>user-manual.html in subsurface/build/Documentation. There must be some 
>issue with the build script or am I going mad?
>
>Kind regards,
>
>willem
>
>
>
>-- 
>This message and attachments are subject to a disclaimer.
>
>Please refer to 
>http://upnet.up.ac.za/services/it/documentation/docs/004167.pdf 
> for
>full 
>details.

-- 
From my phone___
subsurface mailing list
subsurface@subsurface-divelog.org
http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface

Re: PR #1277

2018-09-15 Thread Lubomir I. Ivanov 
On 15 September 2018 at 14:11, Willem Ferguson
 wrote:
> Dear Lubomir, Dirk,
>
> Please look at #1277. Github told me at the time that this PR was pulled and
> it is indeed reflected in the latest master user-manual.txt in
> src/subsurface/Documentation. BUT it is clearly NOT in the present
> user-manual.html in subsurface/build/Documentation. There must be some issue
> with the build script or am I going mad?
>

Willem, i can confirm that the additions you've made are not reflected
in the user-manual.html file.
no errors are thrown:

-- Installing: 
/home/lubo-it/src/install-root/share/subsurface/Documentation/user-manual.html
-- Installing: 
/home/lubo-it/src/install-root/share/subsurface/Documentation/user-manual_es.html
-- Installing: 
/home/lubo-it/src/install-root/share/subsurface/Documentation/user-manual_fr.html
-- Installing: 
/home/lubo-it/src/install-root/share/subsurface/Documentation/user-manual_ru.html

searching for one of the new strings from this PR:

lubo-it@luboitvbox:~/src/subsurface/build/Documentation$ grep "In pSCR
diving" * -rnI
user-manual_fr.html:3130:In pSCR diving, the
inspired gas often has a pO2 below that of the fresh
(the string is only found in the FR translation of the manual)

we seem to have a docs generation bug, but i won't have the time to
debug this during the weekend.

something that can be done is find which commit broke it, here is the
history of commit SHAs:
https://github.com/Subsurface-divelog/subsurface/commits/master/Documentation/user-manual.txt

then this can be done:
  git checkout 
  rebuild subsurface...
to find the last one which works.

also a question - your commit is
https://github.com/Subsurface-divelog/subsurface/commit/773ee0d990d1b5d9783a9eef5784e7c4963ca02c
did you verify that your additions look good after the HTML is generated?

lubomir
--
___
subsurface mailing list
subsurface@subsurface-divelog.org
http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface

PR #1277

2018-09-15 Thread Willem Ferguson 

Dear Lubomir, Dirk,

Please look at #1277. Github told me at the time that this PR was pulled 
and it is indeed reflected in the latest master user-manual.txt in 
src/subsurface/Documentation. BUT it is clearly NOT in the present 
user-manual.html in subsurface/build/Documentation. There must be some 
issue with the build script or am I going mad?


Kind regards,

willem



--
This message and attachments are subject to a disclaimer.

Please refer to 
http://upnet.up.ac.za/services/it/documentation/docs/004167.pdf 
 for
full 
details.

___
subsurface mailing list
subsurface@subsurface-divelog.org
http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface