| Time |
Nick |
Message |
| 02:05 |
|
book` joined #evergreen |
| 07:50 |
|
BDorsey joined #evergreen |
| 07:56 |
|
rfrasur joined #evergreen |
| 08:28 |
|
rfrasur joined #evergreen |
| 08:42 |
|
mmorgan joined #evergreen |
| 08:47 |
|
Dyrcona joined #evergreen |
| 09:19 |
|
Christineb joined #evergreen |
| 09:19 |
|
jvwoolf joined #evergreen |
| 09:22 |
|
mantis1 joined #evergreen |
| 09:29 |
|
collum joined #evergreen |
| 09:57 |
mantis1 |
Hi all. stuck on a translation problem and unsure if IRC can help as it might be local based. |
| 09:57 |
mantis1 |
I'm working on getting translations into the config.i18n_core table and cross checking with what's left to translate in the advanced search filters and our 950.seed-data-values table. If I don't find an entry in the 950 file in the original English for translation, would I need to manually add it? |
| 09:57 |
mantis1 |
again sorry if this is too much of a local question |
| 09:58 |
berick |
mantis1: if i understand the question, you can add local translations regardless of what's in 950.seed-data-values. |
| 10:02 |
mantis1 |
Ah you can? |
| 10:02 |
mantis1 |
We've been doing something like this |
| 10:02 |
mantis1 |
INSERT INTO config.i18n_core (fq_field, identity_value, translation, string) VALUES ('ccvm.value', '12227', 'es-ES', 'Revistas descargables'); |
| 10:02 |
mantis1 |
And we've been using the id from the code_value_map |
| 10:02 |
mantis1 |
but I've been using the 950 file to search for the string to find the id |
| 10:04 |
berick |
you can find the same info directly in the DB |
| 10:26 |
mantis1 |
berick: ah that's much better; I was looking under the wrong column |
| 10:26 |
mantis1 |
berick++ |
| 11:30 |
|
kworstell-isl joined #evergreen |
| 11:51 |
mantis1 |
another question: https://wiki.evergreen-ils.org/doku.php?id=newdevs:git:signoff |
| 11:51 |
mantis1 |
How do you get the hash for the cherry-pick command? |
| 11:51 |
berick |
mantis1: 'git log' on the branch in question |
| 11:52 |
Dyrcona |
mantis1: You can use more than just hashes with cherry-pick. |
| 11:53 |
mantis1 |
It was saying to use the first 7+ characters of the commit code but I get 'bad revision' when I try to cherry pick |
| 11:54 |
gmcharlt |
uh, what's that new rel_3_10_0 branch about? we already have tags/rel_3_10_0 |
| 11:56 |
Dyrcona |
Dunno. Bet someone pushed it by accident. |
| 11:57 |
Dyrcona |
mantis1: Two questions: 1) is it only 1 commit that you want to cherry-pick and 2) is it the top commit on the branch? |
| 11:57 |
mantis1 |
Dyrcona: only one commit |
| 11:57 |
mantis1 |
this is the specific link |
| 11:57 |
mantis1 |
https://git.evergreen-ils.org/?p=working/Evergreen.git;a=commit;h=ad804c00e59bdfaef1d33cd8298154546b340c49 |
| 11:57 |
berick |
mantis1: you can use the entire commit hash, not just the first 7 characters |
| 11:58 |
mantis1 |
hm 'bad object' |
| 11:59 |
Dyrcona |
mantis1: You can use the branch name, including the remote, instead of the commit hash: git cherry-pick -s working//user/mccanna/lp1998386_add_report_template_id_to_interface |
| 11:59 |
berick |
may have to 'git fetch --all' first |
| 11:59 |
Dyrcona |
Well, yeah, what berick said. |
| 11:59 |
mantis1 |
I did do that earlier |
| 11:59 |
mantis1 |
I can try again |
| 11:59 |
Dyrcona |
Always, always, always, start any git work with `git fetch --all` |
| 12:01 |
mantis1 |
ahhh of course-wrong directory |
| 12:01 |
mantis1 |
womp womp |
| 12:01 |
mantis1 |
thanks for the help anyway; I was going to ask about the hash |
| 12:01 |
mantis1 |
Dyrcona++ |
| 12:01 |
mantis1 |
berick++ |
| 12:01 |
mantis1 |
Can you tell I got out of a three day weekend? |
| 12:02 |
Dyrcona |
mantis1++ three_day_weekend++ |
| 12:03 |
Dyrcona |
I like getting the "you're not in a git repository" message. |
| 12:03 |
mantis1 |
I opened up the wrong folder in VS Code-I didn't name them well |
| 12:03 |
mantis1 |
2022mantis-- |
| 13:03 |
csharp_ |
mantis1++ |
| 14:51 |
|
jvwoolf left #evergreen |
| 15:13 |
mmorgan |
Dyrcona++ |
| 17:08 |
|
mmorgan left #evergreen |
| 18:02 |
|
jonadab joined #evergreen |
| 19:20 |
|
dmoore joined #evergreen |
